diff options
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 |
commit | a22d1843900f65ede3f87d55207ca0b8f2a38b98 (patch) | |
tree | 2a80883ce31d38a325747f2d3b7596f19a647d35 /source/l | |
parent | 77f4f1f5e6332a7c51dad716aba3ff2b03dc8d8a (diff) | |
download | current-a22d1843900f65ede3f87d55207ca0b8f2a38b98.tar.gz |
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/l')
-rwxr-xr-x | source/l/libtasn1/libtasn1.SlackBuild | 3 | ||||
-rwxr-xr-x | source/l/libunistring/libunistring.SlackBuild | 3 | ||||
-rwxr-xr-x | source/l/lmdb/lmdb.SlackBuild | 6 | ||||
-rwxr-xr-x | source/l/parted/parted.SlackBuild | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/source/l/libtasn1/libtasn1.SlackBuild b/source/l/libtasn1/libtasn1.SlackBuild index ad3c897a..6cd13705 100755 --- a/source/l/libtasn1/libtasn1.SlackBuild +++ b/source/l/libtasn1/libtasn1.SlackBuild @@ -59,6 +59,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 cd $TMP diff --git a/source/l/libunistring/libunistring.SlackBuild b/source/l/libunistring/libunistring.SlackBuild index 047a9ae6..8565e584 100755 --- a/source/l/libunistring/libunistring.SlackBuild +++ b/source/l/libunistring/libunistring.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 diff --git a/source/l/lmdb/lmdb.SlackBuild b/source/l/lmdb/lmdb.SlackBuild index db62820d..d71b2705 100755 --- a/source/l/lmdb/lmdb.SlackBuild +++ b/source/l/lmdb/lmdb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lmdb VERSION=${VERSION:-$(echo LMDB_*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -74,9 +74,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PKGNAM-$VERSION +rm -rf lmdb-*${VERSION} tar xvf $CWD/LMDB_$VERSION.tar.?z || exit 1 -cd lmdb-LMDB_$VERSION || exit 1 +cd lmdb-*${VERSION} || exit 1 zcat $CWD/lmdb-make.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/lmdb-s390-check.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/l/parted/parted.SlackBuild b/source/l/parted/parted.SlackBuild index fb77a67a..ecbdafe5 100755 --- a/source/l/parted/parted.SlackBuild +++ b/source/l/parted/parted.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 cd $TMP |