summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/nasm
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-07-16 12:55:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-18 11:06:32 +0100
commitbca543d3232d61b209b42cf62c0ecbe071bd5308 (patch)
tree1789696b8a610f59c1a849f98da2ac6fdb5f1d14 /meta/recipes-devtools/nasm
parentbd17c6bade219eac2af3bc6ca18c58d1946cffba (diff)
downloadpoky-bca543d3232d61b209b42cf62c0ecbe071bd5308.tar.gz
nasm: fix build with autoconf 2.70
autoconf 2.70 is coming soon which has some small behavioural fixes, so backport a patch from upstream to fix the build with that release. (From OE-Core rev: 954022e97c940239cee1789e4917e1c393dbf3fb) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/nasm')
-rw-r--r--meta/recipes-devtools/nasm/nasm/0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch28
-rw-r--r--meta/recipes-devtools/nasm/nasm_2.14.02.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/nasm/nasm/0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch b/meta/recipes-devtools/nasm/nasm/0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch
new file mode 100644
index 0000000000..b52dc5ba7b
--- /dev/null
+++ b/meta/recipes-devtools/nasm/nasm/0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch
@@ -0,0 +1,28 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From 287964d54b64bed833adba307e1d920f8fcf0cbc Mon Sep 17 00:00:00 2001
5From: Ozkan Sezer <sezero@users.sourceforge.net>
6Date: Wed, 7 Aug 2019 15:50:50 +0300
7Subject: [PATCH] fix pa_add_headers.m4 for development versions of autoconf
8 (bug 3392471)
9
10Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
11---
12 autoconf/m4/pa_add_headers.m4 | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/aclocal.m4 b/aclocal.m4
16index 1af2dd5d..6ce3e6c1 100644
17--- a/aclocal.m4
18+++ b/aclocal.m4
19@@ -169,7 +169,8 @@ dnl --------------------------------------------------------------------------
20 AC_DEFUN(_PA_ADD_HEADER,
21 [AC_CHECK_HEADERS([$1],[ac_includes_default="$ac_includes_default
22 #include <$1>"
23-])])
24+])
25+])
26
27 AC_DEFUN(PA_ADD_HEADERS,
28 [m4_map_args_w([$1],[_PA_ADD_HEADER(],[)])])
diff --git a/meta/recipes-devtools/nasm/nasm_2.14.02.bb b/meta/recipes-devtools/nasm/nasm_2.14.02.bb
index f8a8d76e99..c40be8fbbf 100644
--- a/meta/recipes-devtools/nasm/nasm_2.14.02.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.14.02.bb
@@ -8,6 +8,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \
8 file://CVE-2019-14248.patch \ 8 file://CVE-2019-14248.patch \
9 file://0001-stdlib-Add-strlcat.patch \ 9 file://0001-stdlib-Add-strlcat.patch \
10 file://0002-Add-debug-prefix-map-option.patch \ 10 file://0002-Add-debug-prefix-map-option.patch \
11 file://0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "3f489aa48ad2aa1f967dc5e293bbd06f" 14SRC_URI[md5sum] = "3f489aa48ad2aa1f967dc5e293bbd06f"