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>
This commit is contained in:
Ross Burton
2020-07-16 12:55:46 +01:00
committed by Richard Purdie
parent bd17c6bade
commit bca543d323
2 changed files with 29 additions and 0 deletions

View File

@@ -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(],[)])])

View File

@@ -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"