From 92f86a8acb39ff9936ff432e5661321113dadae0 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 11 Feb 2022 20:21:11 -0500 Subject: [PATCH] system/dieharder: Fix 15.0 build. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- system/dieharder/dieharder.SlackBuild | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/system/dieharder/dieharder.SlackBuild b/system/dieharder/dieharder.SlackBuild index 72d79b0e81..cf55237585 100644 --- a/system/dieharder/dieharder.SlackBuild +++ b/system/dieharder/dieharder.SlackBuild @@ -26,6 +26,9 @@ ## GNU GPL v2 (with beverage provision). Please see the file COPYING ## in the dieharder source distribution for more on this. +# 20220211 bkw: Modified by SlackBuilds.org: add -j1 to the make commands +# because parallel builds are broken. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dieharder @@ -42,9 +45,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,9 +79,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ # apply patches, mostly to appease crusty autoconf. patch -p1 < $CWD/$PRGNAM.patch @@ -102,14 +102,10 @@ CXXFLAGS="$SLKCFLAGS" \ --with-gnu-ld \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +make -j1 +make -j1 install-strip DESTDIR=$PKG +rm -f $PKG/usr/lib*/*.la +gzip -9 $PKG/usr/man/man*/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING NOTES AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION