From 0e6f7049d6a514115df0164db47fbd8763cf5148 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 9 Nov 2018 02:42:22 +0000
Subject: Fri Nov  9 02:42:22 UTC 2018

a/efibootmgr-16-x86_64-2.txz:  Rebuilt.
  Reverted to previous version. We'd tried this before and it still doesn't
  work. Thanks to _RDS_.
a/efivar-35-x86_64-1.txz:  Upgraded.
  Reverted to previous version. We'd tried this before and it still doesn't
  work. Thanks to _RDS_.
a/hwdata-0.317-noarch-1.txz:  Upgraded.
a/lvm2-2.03.01-x86_64-1.txz:  Upgraded.
a/quota-4.04-x86_64-1.txz:  Upgraded.
ap/cups-2.2.9-x86_64-1.txz:  Upgraded.
ap/sysstat-12.0.2-x86_64-1.txz:  Upgraded.
d/cscope-15.9-x86_64-1.txz:  Upgraded.
d/distcc-3.3.2-x86_64-1.txz:  Upgraded.
d/nasm-2.14-x86_64-1.txz:  Upgraded.
d/oprofile-1.3.0-x86_64-1.txz:  Upgraded.
d/rust-1.30.1-x86_64-1.txz:  Upgraded.
l/elfutils-0.174-x86_64-1.txz:  Upgraded.
l/shared-mime-info-1.10-x86_64-1.txz:  Upgraded.
n/samba-4.9.2-x86_64-1.txz:  Upgraded.
xap/gimp-2.10.8-x86_64-1.txz:  Upgraded.
---
 source/d/nasm/nasm.SlackBuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'source/d/nasm/nasm.SlackBuild')

diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild
index 458cabb8a..1e19f070f 100755
--- a/source/d/nasm/nasm.SlackBuild
+++ b/source/d/nasm/nasm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=nasm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -44,6 +44,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 if [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 else
@@ -60,9 +62,6 @@ rm -rf nasm-$VERSION
 tar xvf $CWD/nasm-$VERSION.tar.?z* || exit 1
 cd nasm-$VERSION || exit 1
 
-# Fix FTBFS with gcc8:
-zcat $CWD/0001-Remove-invalid-pure_func-qualifiers.patch.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,13 +75,15 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=${ARCH}-slackware-linux || exit 1
 
-make || exit 1
+make $NUMJOBS || make || exit 1
+
 ( cd doc
   make nasmdoc.txt || exit 1
   mkdir -p $PKG/usr/doc/nasm-$VERSION
   cp nasmdoc.txt $PKG/usr/doc/nasm-$VERSION
 ) || exit 1
-make install INSTALLROOT=$PKG || exit 1
+
+make install DESTDIR=$PKG || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-- 
cgit v1.2.3