diff options
Diffstat (limited to 'source/d')
-rwxr-xr-x | source/d/binutils/binutils.SlackBuild | 6 | ||||
-rwxr-xr-x | source/d/python-setuptools/python-setuptools.SlackBuild | 6 |
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 . \ |