summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-02-09 19:23:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:43 -0800
commita06e298de8306356327485be03404e45ed1941fa (patch)
treee59fb1e7119e6f4d7e63b49eb8855bcbaca0bd7d
parentbaf1dbc1987e35157b276070d5ed0d62e36b59a7 (diff)
downloadpoky-a06e298de8306356327485be03404e45ed1941fa.tar.gz
m4: 1.4.17 -> 1.4.18
Rebased remove-gets.patch. (From OE-Core rev: d87a41d2dc611259989cb1252c34d0c6ef802971) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.18.inc (renamed from meta/recipes-devtools/m4/m4-1.4.17.inc)5
-rw-r--r--meta/recipes-devtools/m4/m4-native_1.4.18.bb (renamed from meta/recipes-devtools/m4/m4-native_1.4.17.bb)0
-rw-r--r--meta/recipes-devtools/m4/m4/remove-gets.patch15
-rw-r--r--meta/recipes-devtools/m4/m4_1.4.18.bb (renamed from meta/recipes-devtools/m4/m4_1.4.17.bb)0
4 files changed, 11 insertions, 9 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.17.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc
index 8ea4e04907..5652b74308 100644
--- a/meta/recipes-devtools/m4/m4-1.4.17.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.18.inc
@@ -14,5 +14,6 @@ SRC_URI += "file://ac_config_links.patch \
14SRC_URI_append_class-target = "\ 14SRC_URI_append_class-target = "\
15 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 15 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
16 " 16 "
17SRC_URI[md5sum] = "a5e9954b1dae036762f7b13673a2cf76" 17
18SRC_URI[sha256sum] = "3ce725133ee552b8b4baca7837fb772940b25e81b2a9dc92537aeaf733538c9e" 18SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
19SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.17.bb b/meta/recipes-devtools/m4/m4-native_1.4.18.bb
index 06d8aa244e..06d8aa244e 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.17.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.18.bb
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch
index effb353f11..abe82f3b2d 100644
--- a/meta/recipes-devtools/m4/m4/remove-gets.patch
+++ b/meta/recipes-devtools/m4/m4/remove-gets.patch
@@ -4,20 +4,21 @@ undefining it.
4 4
5Upstream-Status: Pending 5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Index: m4-1.4.17/lib/stdio.in.h 7---
8=================================================================== 8diff --git a/lib/stdio.in.h b/lib/stdio.in.h
9--- m4-1.4.17.orig/lib/stdio.in.h 2013-10-16 14:41:01.678496227 +0300 9index 5727452..f04a691 100644
10+++ m4-1.4.17/lib/stdio.in.h 2013-10-16 14:41:48.849427839 +0300 10--- a/lib/stdio.in.h
11@@ -717,10 +717,12 @@ 11+++ b/lib/stdio.in.h
12@@ -742,10 +742,12 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
12 /* It is very rare that the developer ever has full control of stdin, 13 /* It is very rare that the developer ever has full control of stdin,
13 so any use of gets warrants an unconditional warning; besides, C11 14 so any use of gets warrants an unconditional warning; besides, C11
14 removed it. */ 15 removed it. */
15+#if defined gets 16+#if defined gets
16 #undef gets 17 #undef gets
17 #if HAVE_RAW_DECL_GETS 18 #if HAVE_RAW_DECL_GETS && !defined __cplusplus
18 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); 19 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
19 #endif 20 #endif
20+#endif 21+#endif
21 22
22
23 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ 23 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
24 struct obstack;
diff --git a/meta/recipes-devtools/m4/m4_1.4.17.bb b/meta/recipes-devtools/m4/m4_1.4.18.bb
index b12c0adf3a..b12c0adf3a 100644
--- a/meta/recipes-devtools/m4/m4_1.4.17.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.18.bb