summaryrefslogtreecommitdiff
path: root/source/d
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-09-12 21:19:38 +0000
committerEric Hameleers <alien@slackware.com>2018-09-13 09:00:32 +0200
commit4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e (patch)
tree9db69cd6844d576aa97a12f01166f84c3db65fe8 /source/d
parent4ffeac73188b0486a8c6a6dac099a2675276e599 (diff)
downloadcurrent-4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e.tar.gz
Wed Sep 12 21:19:38 UTC 201820180912211938
a/elilo-3.16-x86_64-8.txz: Rebuilt. eliloconfig: this was occasionally failing and the issue was traced to the script's use of tr (not sure why still). Replaced the construct with sed and the issue seems to have gone away. a/openssl-solibs-1.1.1-x86_64-1.txz: Upgraded. d/binutils-2.31.1-x86_64-3.txz: Rebuilt. Do not install the Windows-specific tools. Not only are these useless on Linux, but the presence of windres fools freetype into thinking that it is on a Windows system, leading to a build failure. d/git-2.19.0-x86_64-1.txz: Upgraded. l/freetype-2.9.1-x86_64-1.txz: Upgraded. l/harfbuzz-1.9.0-x86_64-1.txz: Upgraded. l/media-player-info-24-noarch-1.txz: Upgraded. l/pcre2-10.32-x86_64-1.txz: Upgraded. l/sg3_utils-1.43-x86_64-1.txz: Upgraded. n/openssl-1.1.1-x86_64-1.txz: Upgraded. x/fontconfig-2.13.1-x86_64-1.txz: Upgraded. We had problem reports with fontconfig-2.13.0 which led to it being reverted but we'll try it again. Please let me know if the issues (with Wine iirc) persist. x/libinput-1.12.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d')
-rwxr-xr-xsource/d/binutils/binutils.SlackBuild6
-rwxr-xr-xsource/d/python-setuptools/python-setuptools.SlackBuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild
index a189cba2..cea4ac38 100755
--- a/source/d/binutils/binutils.SlackBuild
+++ b/source/d/binutils/binutils.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=binutils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
@@ -184,6 +184,10 @@ mkdir -p $PKG/usr/${TARGET}/bin
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+# Remove Windows specific tools / docs (if they exist):
+rm -f $PKG/usr/bin/{dlltool,nlmconv,windres,windmc}
+rm -f $PKG/usr/man/man1/{dlltool,nlmconv,windres,windmc}*
+
# Add a symlink since binutils's version of strings used to be called
# "strings-GNU" on Slackware, and it's possible that people have scripts
# that use that name:
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild
index aaacb14d..b178de8c 100755
--- a/source/d/python-setuptools/python-setuptools.SlackBuild
+++ b/source/d/python-setuptools/python-setuptools.SlackBuild
@@ -28,13 +28,13 @@ if ls *.zip 1> /dev/null 2> /dev/null ; then
unzip *.zip
tar cf $(basename *.zip .zip).tar $(basename *.zip .zip)
touch -r *.zip *.tar
- xz -9 *.tar
+ plzip -9 *.tar
rm -r $(basename *.zip .zip)
rm *.zip
fi
PKGNAM=python-setuptools
-VERSION=${VERSION:-$(echo setuptools-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
SRCNAM=setuptools
@@ -62,7 +62,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
cd $SRCNAM-$VERSION || exit 1
chown -R root:root .
find -L . \