summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-07-17 05:33:01 +0000
committer Eric Hameleers <alien@slackware.com>2019-07-17 17:59:48 +0200
commita528a0b94eee4e03c8decfdb3e9dc0e0b9cae6bd (patch)
treeb61f827d153a3029a9c554069e67e84139c68a17 /source
parent28dec63a8c77f63f60576532b7f2e3b6cb7051ee (diff)
downloadcurrent-a528a0b94eee4e03c8decfdb3e9dc0e0b9cae6bd.tar.gz
current-a528a0b94eee4e03c8decfdb3e9dc0e0b9cae6bd.tar.xz
Wed Jul 17 05:33:01 UTC 201920190717053301
d/cmake-3.14.6-x86_64-1.txz: Upgraded. d/strace-5.2-x86_64-1.txz: Upgraded. d/vala-0.44.6-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/d/cmake/cmake.SlackBuild17
-rwxr-xr-xsource/l/LibRaw/LibRaw.SlackBuild3
2 files changed, 4 insertions, 16 deletions
diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild
index b20759875..10c161287 100755
--- a/source/d/cmake/cmake.SlackBuild
+++ b/source/d/cmake/cmake.SlackBuild
@@ -76,26 +76,12 @@ find . \
mkdir cmake-build
cd cmake-build
-../bootstrap \
- --prefix=/usr \
- --docdir=/doc/$PKGNAM-$VERSION \
- --qt-gui \
- --system-curl \
- --system-expat \
- --no-system-jsoncpp \
- --system-zlib \
- --system-bzip2 \
- --system-libarchive || exit 1
-# --system-libs
-# --sphinx-man \
-
-
-# Build
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
../configure \
--prefix=/usr \
--docdir=/doc/$PKGNAM-$VERSION \
+ --parallel=$(echo $NUMJOBS | cut -f 2 -d j | tr -d ' ') \
--qt-gui \
--system-curl \
--system-expat \
@@ -106,7 +92,6 @@ CXXFLAGS="$SLKCFLAGS" \
# --system-libs \
# --sphinx-man \
-
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
diff --git a/source/l/LibRaw/LibRaw.SlackBuild b/source/l/LibRaw/LibRaw.SlackBuild
index c4f59f639..8c613a967 100755
--- a/source/l/LibRaw/LibRaw.SlackBuild
+++ b/source/l/LibRaw/LibRaw.SlackBuild
@@ -93,6 +93,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \