summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Telszewski <atelszewski@gmail.com>2019-07-20 09:05:41 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-07-20 09:05:41 +0700
commit88bbdc160da0c717cf023f096c74cde658f598e2 (patch)
treeff34e7cbd7a37c64e9ecad5603640cdbd087cd55
parent9f27a1d03baef5f0acd536b62a24e4232207a271 (diff)
downloadslackbuilds-88bbdc160da0c717cf023f096c74cde658f598e2.tar.gz
development/qt-creator-llvm: Updated for version 7.0_4a75f114.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/qt-creator-llvm/qt-creator-llvm.SlackBuild83
-rw-r--r--development/qt-creator-llvm/qt-creator-llvm.info14
-rw-r--r--development/qt-creator-llvm/slack-desc2
3 files changed, 48 insertions, 51 deletions
diff --git a/development/qt-creator-llvm/qt-creator-llvm.SlackBuild b/development/qt-creator-llvm/qt-creator-llvm.SlackBuild
index 4a8d471699..c51fe65ec6 100644
--- a/development/qt-creator-llvm/qt-creator-llvm.SlackBuild
+++ b/development/qt-creator-llvm/qt-creator-llvm.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for LLVM/Clang tools for Qt Creator
-# Copyright 2018 Andrzej Telszewski, Szczecin
+# Copyright 2019 Andrzej Telszewski, Szczecin
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qt-creator-llvm
-VERSION=${VERSION:-5.0.1_427ad76}
-VERSION_CLAZY=${VERSION_CLAZY:-427ad7689ac65bc4106c0a420c1165cc57f1eef7}
-VERSION_LLVM=$( echo $VERSION | cut -f1 -d_ )
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-7.0_4a75f114}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -62,19 +60,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/llvm-$VERSION_LLVM.src.tar.xz
-mv llvm-$VERSION_LLVM.src $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
-tar xvf $CWD/cfe-$VERSION_LLVM.src.tar.xz -C tools
-mv tools/cfe-$VERSION_LLVM.src tools/clang
-
-tar xvf $CWD/clang-tools-extra-$VERSION_LLVM.src.tar.xz -C tools/clang/tools
-mv tools/clang/tools/clang-tools-extra-$VERSION_LLVM.src tools/clang/tools/extra
-
-tar xvf $CWD/clazy-$VERSION_CLAZY.tar.gz -C tools/clang/tools/extra
-mv tools/clang/tools/extra/clazy-$VERSION_CLAZY tools/clang/tools/extra/clazy
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -82,8 +70,17 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Apply patches found in Qt Creator source tree.
-git apply --whitespace=fix $CWD/patches/*.patch
+# Exceptionally, copy the docs before the build starts.
+# This can save you quite some time in a case of a missing doc file.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{clang,clang-tools-extra,clazy}
+cp -a CODE_OWNERS.TXT CREDITS.TXT LICENSE.TXT README.txt RELEASE_TESTERS.TXT \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a tools/clang/{CODE_OWNERS.TXT,LICENSE.TXT,README.txt} \
+ $PKG/usr/doc/$PRGNAM-$VERSION/clang
+cp -a tools/clang/tools/extra/{CODE_OWNERS.TXT,LICENSE.TXT,README.txt} \
+ $PKG/usr/doc/$PRGNAM-$VERSION/clang-tools-extra
+cp -a tools/clang/tools/extra/clazy/{COPYING-LGPL2.txt,Changelog,HOWTO,README.md} \
+ $PKG/usr/doc/$PRGNAM-$VERSION/clazy
mkdir -p build
cd build
@@ -102,37 +99,43 @@ cd build
make install DESTDIR=$PKG
cd ..
-# Remove unnecessary components (reduce the package size).
-VERSION_LLVM_MAJ_MIN=$( echo $VERSION_LLVM | cut -f-2 -d. )
+# Determine "clang" binary version.
+VERSION_CLANG=$( echo $VERSION | cut -f1 -d_ )
+
+if ! [ -x $PKG/usr/libexec/qtcreator/clang/bin/clang-$VERSION_CLANG ]; then
+ VERSION_CLANG=$( echo $VERSION_CLANG | cut -f1 -d. )
+fi
+
+if ! [ -x $PKG/usr/libexec/qtcreator/clang/bin/clang-$VERSION_CLANG ]; then
+ VERSION_CLANG=
+
+ echo "error: Unable to determine \"clang\" binary version."
+ exit 1
+fi
+
+# Remove unnecessary components (reduce package size).
find $PKG/usr/libexec/qtcreator/clang/bin -mindepth 1 -not \( \
- -name clang -o -name clang-$VERSION_LLVM_MAJ_MIN -o -name llvm-config \) \
+ -name clang -o -name clang-$VERSION_CLANG -o -name llvm-config \) \
-exec rm {} \;
-find $PKG/usr/libexec/qtcreator/clang/lib -name \*.a -not \( \
- -name libclangTooling.a -o -name libclangIndex.a -o -name libclangFrontend.a -o \
- -name libclangParse.a -o -name libclangSerialization.a -o -name libclangSema.a -o \
- -name libclangEdit.a -o -name libclangAnalysis.a -o -name libclangDriver.a -o \
- -name libclangDynamicASTMatchers.a -o -name libclangASTMatchers.a -o \
- -name libclangToolingCore.a -o -name libclangAST.a -o -name libclangLex.a -o \
- -name libclangBasic.a \) \
- -exec rm {} \;
+# FIXME: Find patience to find out which libs are required by Qt Creator
+# and then remove the unnecessary ones.
+#find $PKG/usr/libexec/qtcreator/clang/lib -name \*.a -not \( \
+# -name libclangTooling.a -o -name libclangIndex.a -o -name libclangFrontend.a -o \
+# -name libclangParse.a -o -name libclangSerialization.a -o -name libclangSema.a -o \
+# -name libclangEdit.a -o -name libclangAnalysis.a -o -name libclangDriver.a -o \
+# -name libclangDynamicASTMatchers.a -o -name libclangASTMatchers.a -o \
+# -name libclangToolingCore.a -o -name libclangAST.a -o -name libclangLex.a -o \
+# -name libclangBasic.a \) \
+# -exec rm {} \;
-rm -r $PKG/usr/libexec/qtcreator/clang/libexec
-rm -r $PKG/usr/libexec/qtcreator/clang/share
+rm -rf $PKG/usr/libexec/qtcreator/clang/libexec
+rm -rf $PKG/usr/libexec/qtcreator/clang/share
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{clang,clang-tools-extra,clazy}
-cp -a CODE_OWNERS.TXT CREDITS.TXT LICENSE.TXT README.txt RELEASE_TESTERS.TXT \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a tools/clang/{CODE_OWNERS.TXT,LICENSE.TXT,README.txt} \
- $PKG/usr/doc/$PRGNAM-$VERSION/clang
-cp -a tools/clang/tools/extra/{CODE_OWNERS.TXT,LICENSE.TXT,README.txt} \
- $PKG/usr/doc/$PRGNAM-$VERSION/clang-tools-extra
-cp -a tools/clang/tools/extra/clazy/{COPYING-LGPL2.txt,Changelog,HOWTO,README.md} \
- $PKG/usr/doc/$PRGNAM-$VERSION/clazy
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/qt-creator-llvm/qt-creator-llvm.info b/development/qt-creator-llvm/qt-creator-llvm.info
index 39cd334711..5639ba6785 100644
--- a/development/qt-creator-llvm/qt-creator-llvm.info
+++ b/development/qt-creator-llvm/qt-creator-llvm.info
@@ -1,14 +1,8 @@
PRGNAM="qt-creator-llvm"
-VERSION="5.0.1_427ad76"
-HOMEPAGE="https://llvm.org/"
-DOWNLOAD="https://llvm.org/releases/5.0.1/llvm-5.0.1.src.tar.xz \
- https://llvm.org/releases/5.0.1/cfe-5.0.1.src.tar.xz \
- https://llvm.org/releases/5.0.1/clang-tools-extra-5.0.1.src.tar.xz \
- https://github.com/KDE/clazy/archive/427ad7689ac65bc4106c0a420c1165cc57f1eef7/clazy-427ad7689ac65bc4106c0a420c1165cc57f1eef7.tar.gz"
-MD5SUM="3a4ec6dcbc71579eeaec7cb157fe2168 \
- e4daa278d8f252585ab73d196484bf11 \
- c2bd3733c183b033b49f7a416c6dca36 \
- 0c349da84f57ae32d3af629cb529998e"
+VERSION="7.0_4a75f114"
+HOMEPAGE="https://code.qt.io/cgit/clang/llvm.git/"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/qt-creator-llvm/qt-creator-llvm-7.0_4a75f114.tar.gz"
+MD5SUM="5ad42628b0219433010ac2f1fbb5791d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/qt-creator-llvm/slack-desc b/development/qt-creator-llvm/slack-desc
index 7f3575f3e1..10201134d4 100644
--- a/development/qt-creator-llvm/slack-desc
+++ b/development/qt-creator-llvm/slack-desc
@@ -13,7 +13,7 @@ qt-creator-llvm: in order to extend Qt Creator's functionality.
qt-creator-llvm: Some of the Qt Creator's tools enabled by this package are:
qt-creator-llvm: Clang Code Model, Clang-Tidy, Clazy and Clang Static Analyzer.
qt-creator-llvm:
-qt-creator-llvm: Homepage: https://llvm.org/
+qt-creator-llvm: Homepage: https://code.qt.io/cgit/clang/llvm.git/
qt-creator-llvm:
qt-creator-llvm:
qt-creator-llvm: