summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-09-18 19:22:30 +0000
committer Eric Hameleers <alien@slackware.com>2018-09-19 09:00:33 +0200
commita22d1843900f65ede3f87d55207ca0b8f2a38b98 (patch)
tree2a80883ce31d38a325747f2d3b7596f19a647d35 /source/d
parent77f4f1f5e6332a7c51dad716aba3ff2b03dc8d8a (diff)
downloadcurrent-a22d1843900f65ede3f87d55207ca0b8f2a38b98.tar.gz
current-a22d1843900f65ede3f87d55207ca0b8f2a38b98.tar.xz
Tue Sep 18 19:22:30 UTC 201820180918192230
ap/dmidecode-3.2-x86_64-1.txz: Upgraded. ap/nano-3.1-x86_64-1.txz: Upgraded. ap/slackpkg-2.83.0-noarch-4.txz: Rebuilt. Merged two patches from git: Clarify that a press of "Enter" is needed to confirm kernel change Mention possible stale mirror if CHECKSUMS.md5 gpg verify fails Thanks to Mario Preksavec and Robby Workman. ap/sqlite-3.25.0-x86_64-1.txz: Upgraded. ap/xorriso-1.5.0-x86_64-1.txz: Upgraded. l/lmdb-0.9.22-x86_64-2.txz: Rebuilt. Fixed the build script to clear out the build area properly - previously it was possible for binaries of the wrong $ARCH to end up in the package. Thanks to reddog83. n/gnutls-3.6.3-x86_64-2.txz: Rebuilt. Merged backported SSL/TLS fixes. Thanks to orbea. n/samba-4.9.0-x86_64-2.txz: Rebuilt. Recompiled in case the lmdb package was broken.
Diffstat (limited to 'source/d')
-rwxr-xr-xsource/d/bison/bison.SlackBuild20
-rwxr-xr-xsource/d/clisp/clisp.SlackBuild3
-rwxr-xr-xsource/d/gdb/gdb.SlackBuild20
-rwxr-xr-xsource/d/guile/guile.SlackBuild3
-rwxr-xr-xsource/d/m4/m4.SlackBuild3
-rwxr-xr-xsource/d/rcs/rcs.SlackBuild3
6 files changed, 14 insertions, 38 deletions
diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild
index 713fda617..03b8b41b8 100755
--- a/source/d/bison/bison.SlackBuild
+++ b/source/d/bison/bison.SlackBuild
@@ -78,25 +78,7 @@ find . \
-exec chmod 644 {} \;
# Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
- if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
- continue
- fi
- if [ -z "$REVERSE_PATH" ]; then
- REVERSE_PATH="$path_element"
- else
- REVERSE_PATH="${REVERSE_PATH}:$path_element"
- fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
- if [ -z "$FORWARD_PATH" ]; then
- FORWARD_PATH="$path_element"
- else
- FORWARD_PATH="${FORWARD_PATH}:$path_element"
- fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild
index 4205aa137..3b210fdac 100755
--- a/source/d/clisp/clisp.SlackBuild
+++ b/source/d/clisp/clisp.SlackBuild
@@ -61,6 +61,9 @@ else
LIBDIRSUFFIX=""
fi
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
NUMJOBS=${NUMJOBS:-" -j7 "}
TMP=${TMP:-/tmp}
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index 41b0fd5d7..e697bf4a4 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -56,25 +56,7 @@ TMP=${TMP:-/tmp}
PKG=$TMP/package-gdb
# Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
- if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
- continue
- fi
- if [ -z "$REVERSE_PATH" ]; then
- REVERSE_PATH="$path_element"
- else
- REVERSE_PATH="${REVERSE_PATH}:$path_element"
- fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
- if [ -z "$FORWARD_PATH" ]; then
- FORWARD_PATH="$path_element"
- else
- FORWARD_PATH="${FORWARD_PATH}:$path_element"
- fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
rm -rf $PKG
mkdir -p $TMP $PKG
diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild
index f90537a15..ff00e4190 100755
--- a/source/d/guile/guile.SlackBuild
+++ b/source/d/guile/guile.SlackBuild
@@ -65,6 +65,9 @@ else
LIBDIRSUFFIX=""
fi
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
cd $TMP
rm -rf guile-$VERSION
tar xvf $CWD/guile-$VERSION.tar.?z || exit 1
diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild
index 0bc3f10fc..e297a1830 100755
--- a/source/d/m4/m4.SlackBuild
+++ b/source/d/m4/m4.SlackBuild
@@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
rm -rf $PKG
mkdir -p $TMP $PKG
diff --git a/source/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild
index f2348714b..d0bc509e8 100755
--- a/source/d/rcs/rcs.SlackBuild
+++ b/source/d/rcs/rcs.SlackBuild
@@ -73,6 +73,9 @@ else
LIBDIRSUFFIX=""
fi
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM