diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-09 02:42:22 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-11-09 08:59:43 +0100 |
| commit | 0e6f7049d6a514115df0164db47fbd8763cf5148 (patch) | |
| tree | 0805050a25bba0fe7e12fbe2acfe18ac846e7d3c /source/d/nasm | |
| parent | fa6118f0a78c511877bf875a9b8f119e1a46eb6f (diff) | |
| download | current-0e6f7049d6a514115df0164db47fbd8763cf5148.tar.gz | |
Fri Nov 9 02:42:22 UTC 201820181109024222
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.
Diffstat (limited to 'source/d/nasm')
| -rw-r--r-- | source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch | 27 | ||||
| -rwxr-xr-x | source/d/nasm/nasm.SlackBuild | 13 |
2 files changed, 7 insertions, 33 deletions
diff --git a/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch b/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch deleted file mode 100644 index 87ec601c..00000000 --- a/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001 -From: Michael Simacek <msimacek@redhat.com> -Date: Thu, 8 Feb 2018 14:47:08 +0100 -Subject: [PATCH] Remove invalid pure_func qualifiers - ---- - include/nasmlib.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/nasmlib.h b/include/nasmlib.h -index 79e866b..c93cef0 100644 ---- a/include/nasmlib.h -+++ b/include/nasmlib.h -@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn); - * seg_init: Initialise the segment-number allocator. - * seg_alloc: allocate a hitherto unused segment number. - */ --void pure_func seg_init(void); --int32_t pure_func seg_alloc(void); -+void seg_init(void); -+int32_t seg_alloc(void); - - /* - * many output formats will be able to make use of this: a standard --- -2.14.3 - diff --git a/source/d/nasm/nasm.SlackBuild b/source/d/nasm/nasm.SlackBuild index 458cabb8..1e19f070 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 |