diff options
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 \) \ |