summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/flex/flex/check-funcs.patch36
1 files changed, 12 insertions, 24 deletions
diff --git a/meta/recipes-devtools/flex/flex/check-funcs.patch b/meta/recipes-devtools/flex/flex/check-funcs.patch
index 037ca81fdc..762275e7f8 100644
--- a/meta/recipes-devtools/flex/flex/check-funcs.patch
+++ b/meta/recipes-devtools/flex/flex/check-funcs.patch
@@ -1,10 +1,4 @@
1Upstream-Status: Backport 1Subject: build: Move dnl comments out of AC_CHECK_FUNCS
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From c42de062bbdc7c31d7181c10a74202d493280ada Mon Sep 17 00:00:00 2001
5From: Explorer09 <explorer09@gmail.com>
6Date: Tue, 27 Feb 2018 09:10:12 +0800
7Subject: [PATCH] build: Move dnl comments out of AC_CHECK_FUNCS
8 2
9Due to a bug, autoheader (2.69) will treat M4 dnl comments in a quoted 3Due to a bug, autoheader (2.69) will treat M4 dnl comments in a quoted
10argument of AC_CHECK_FUNCS as function tokens and generate a lot of 4argument of AC_CHECK_FUNCS as function tokens and generate a lot of
@@ -20,28 +14,20 @@ I have reported the autoheader bug here:
20 14
21As a workaround, let's move comments out of AC_CHECK_FUNCS. 15As a workaround, let's move comments out of AC_CHECK_FUNCS.
22 16
17Upstream-Status: Backport
18Signed-off-by: Ross Burton <ross.burton@arm.com>
19
23Signed-off-by: Kang-Che Sung <explorer09@gmail.com> 20Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
21Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
24--- 22---
25 configure.ac | 29 +++++++++++++---------------- 23 configure.ac | 28 +++++++++++++---------------
26 1 file changed, 13 insertions(+), 16 deletions(-) 24 1 file changed, 13 insertions(+), 15 deletions(-)
27 25
28diff --git a/configure.ac b/configure.ac 26diff --git a/configure.ac b/configure.ac
29index 55e774b0..d0f3b7da 100644 27index 55e774b..5ea3a93 100644
30--- a/configure.ac 28--- a/configure.ac
31+++ b/configure.ac 29+++ b/configure.ac
32@@ -166,6 +166,7 @@ strtol dnl 30@@ -153,21 +153,19 @@ AC_FUNC_REALLOC
33 AC_CHECK_FUNCS([dnl
34 pow dnl Used only by "examples/manual/expr"
35 setlocale dnl Needed only if NLS is enabled
36+reallocarr dnl NetBSD function. Use reallocarray if not available.
37 reallocarray dnl OpenBSD function. We have replacement if not available.
38 ])
39
40diff --git a/configure.ac b/configure.ac
41index 3c977a4e..9c53590f 100644
42--- a/configure.ac
43+++ b/configure.ac
44@@ -158,22 +158,19 @@ AC_FUNC_REALLOC
45 AS_IF([test "$cross_compiling" = yes], 31 AS_IF([test "$cross_compiling" = yes],
46 AC_MSG_WARN([result $ac_cv_func_realloc_0_nonnull guessed because of cross compilation])) 32 AC_MSG_WARN([result $ac_cv_func_realloc_0_nonnull guessed because of cross compilation]))
47 33
@@ -58,7 +44,6 @@ index 3c977a4e..9c53590f 100644
58-AC_CHECK_FUNCS([dnl 44-AC_CHECK_FUNCS([dnl
59-pow dnl Used only by "examples/manual/expr" 45-pow dnl Used only by "examples/manual/expr"
60-setlocale dnl Needed only if NLS is enabled 46-setlocale dnl Needed only if NLS is enabled
61-reallocarr dnl NetBSD function. Use reallocarray if not available.
62-reallocarray dnl OpenBSD function. We have replacement if not available. 47-reallocarray dnl OpenBSD function. We have replacement if not available.
63-]) 48-])
64+dnl Autoheader (<= 2.69) bug: "dnl" comments in a quoted argument of 49+dnl Autoheader (<= 2.69) bug: "dnl" comments in a quoted argument of
@@ -77,3 +62,6 @@ index 3c977a4e..9c53590f 100644
77 62
78 AC_CONFIG_FILES( 63 AC_CONFIG_FILES(
79 Makefile 64 Makefile
65--
662.25.1
67