diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-27 04:13:25 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-06-27 21:00:55 +0200 |
| commit | 63f56cc135f65b25d924c16f959a8819e55740d9 (patch) | |
| tree | f7508feb75b8a6f230f61b50ef94ff16b9d69f49 /source/d/nasm | |
| parent | 2a8b2eba309a73a177e79a88be0b024f642cc350 (diff) | |
| download | current-63f56cc135f65b25d924c16f959a8819e55740d9.tar.gz current-63f56cc135f65b25d924c16f959a8819e55740d9.tar.xz | |
Wed Jun 27 04:13:25 UTC 201820180627041325
a/kernel-generic-4.14.52-x86_64-1.txz: Upgraded.
a/kernel-huge-4.14.52-x86_64-1.txz: Upgraded.
a/kernel-modules-4.14.52-x86_64-1.txz: Upgraded.
ap/sox-14.4.2-x86_64-6.txz: Rebuilt.
Rebuilt to drop libssp dependency. We're no longer building that with gcc
since glibc already includes a built-in SSP implementation.
d/gcc-8.1.1-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
This is taken from the gcc-8-branch of the svn repo on 20180626, revision
r262159. All packages have been tested for build failures and all new FTBFS
issues are fixed - I think we're down to the six possibly obsolete X drivers
(geode, r128, s3virge, savage, sis, and tseng) and virtuoso-ose.
d/gcc-brig-8.1.1-x86_64-1.txz: Upgraded.
d/gcc-g++-8.1.1-x86_64-1.txz: Upgraded.
d/gcc-gfortran-8.1.1-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
d/gcc-gnat-8.1.1-x86_64-1.txz: Upgraded.
d/gcc-go-8.1.1-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
d/gcc-objc-8.1.1-x86_64-1.txz: Upgraded.
d/kernel-headers-4.14.52-x86-1.txz: Upgraded.
d/libtool-2.4.6-x86_64-8.txz: Rebuilt.
Recompiled to update embedded GCC version number.
k/kernel-source-4.14.52-noarch-1.txz: Upgraded.
l/db48-4.8.30-x86_64-4.txz: Rebuilt.
Patched to fix a symbol collision with gcc8.
n/netatalk-3.1.11-x86_64-1.txz: Upgraded.
Thanks to Matthew Schumacher for updating the build script and providing
some useful config file examples.
extra/pure-alsa-system/sox-14.4.2-x86_64-6_alsa.txz: Rebuilt.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
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 | 4 |
2 files changed, 31 insertions, 0 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 new file mode 100644 index 000000000..87ec601c2 --- /dev/null +++ b/source/d/nasm/0001-Remove-invalid-pure_func-qualifiers.patch @@ -0,0 +1,27 @@ +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 f52d2aa53..458cabb8a 100755 --- a/source/d/nasm/nasm.SlackBuild +++ b/source/d/nasm/nasm.SlackBuild @@ -59,6 +59,10 @@ cd $TMP 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 \) \ |