summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-03 23:53:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-03 12:34:22 +0000
commit8fe4344e74a70a88e1bbc79d2c6f93255df9e7be (patch)
tree3d9cb59ae4c05bd25531036013c00a91960ef420 /meta/recipes-devtools
parent3c57cb356e94bd0b2016e9625fef1178cae1100d (diff)
downloadpoky-8fe4344e74a70a88e1bbc79d2c6f93255df9e7be.tar.gz
gettext,m4,augeas,gnutls: Account for removal of gets in eglibc 2.16
These recipes use gnulib which needs this change to use gets when its defined and not otherwise. Until that change goes into gnulib and then all these package upgrade gnulib in their sourcebase we patch them (From OE-Core rev: b955f1a7bc716055c78ed575eccac6f611dc2395) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Resolved merge conflicts with denzil branch and backported gnutls patch. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.16.inc6
-rw-r--r--meta/recipes-devtools/m4/m4/remove-gets.patch21
2 files changed, 25 insertions, 2 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.16.inc b/meta/recipes-devtools/m4/m4-1.4.16.inc
index 139193c958..bb82a3bde0 100644
--- a/meta/recipes-devtools/m4/m4-1.4.16.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.16.inc
@@ -5,8 +5,10 @@ LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
6 file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" 6 file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
7 7
8PR = "r2" 8PR = "r3"
9SRC_URI += "file://ac_config_links.patch" 9SRC_URI += "file://ac_config_links.patch \
10 file://remove-gets.patch \
11 "
10 12
11SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280" 13SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
12SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da" 14SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch
new file mode 100644
index 0000000000..9c396d94f0
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/remove-gets.patch
@@ -0,0 +1,21 @@
1eglibc has remove gets starting 2.16
2therefore check for its being there before
3undefining it.
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Index: m4-1.4.16/lib/stdio.in.h
8===================================================================
9--- m4-1.4.16.orig/lib/stdio.in.h 2011-03-01 08:39:29.000000000 -0800
10+++ m4-1.4.16/lib/stdio.in.h 2012-07-03 08:32:08.145935928 -0700
11@@ -161,8 +161,10 @@
12 /* It is very rare that the developer ever has full control of stdin,
13 so any use of gets warrants an unconditional warning. Assume it is
14 always declared, since it is required by C89. */
15+#if defined gets
16 #undef gets
17 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
18+#endif
19
20 #if @GNULIB_FOPEN@
21 # if @REPLACE_FOPEN@