diff options
| author |   Ross Burton <ross.burton@intel.com> | 2020-07-16 12:55:46 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-18 11:06:27 +0100 |
| commit | 954022e97c940239cee1789e4917e1c393dbf3fb (patch) | |
| tree | e3a5e5b61d529666b64cea44910da6330a56ba78 /meta/recipes-devtools | |
| parent | 946610f2cc8cd42265ee3fab6c73ad4831aaeb4e (diff) | |
| download | openembedded-core-contrib-954022e97c940239cee1789e4917e1c393dbf3fb.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.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/nasm/nasm/0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/nasm/nasm_2.14.02.bb | 1 |
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 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 287964d54b64bed833adba307e1d920f8fcf0cbc Mon Sep 17 00:00:00 2001 +From: Ozkan Sezer <sezero@users.sourceforge.net> +Date: Wed, 7 Aug 2019 15:50:50 +0300 +Subject: [PATCH] fix pa_add_headers.m4 for development versions of autoconf + (bug 3392471) + +Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com> +--- + autoconf/m4/pa_add_headers.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 1af2dd5d..6ce3e6c1 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -169,7 +169,8 @@ dnl -------------------------------------------------------------------------- + AC_DEFUN(_PA_ADD_HEADER, + [AC_CHECK_HEADERS([$1],[ac_includes_default="$ac_includes_default + #include <$1>" +-])]) ++]) ++]) + + AC_DEFUN(PA_ADD_HEADERS, + [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 \ file://CVE-2019-14248.patch \ file://0001-stdlib-Add-strlcat.patch \ file://0002-Add-debug-prefix-map-option.patch \ + file://0001-fix-pa_add_headers.m4-for-development-versions-of-au.patch \ " SRC_URI[md5sum] = "3f489aa48ad2aa1f967dc5e293bbd06f" |