summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-04 06:43:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-03 12:34:22 (GMT)
commit38d697203218069ffac3ac0347efcc236fd423dd (patch)
tree79fd2a77b87716d6a5bf1be4626f9c729db9efca
parentef745cb34fe9ff01456b76c3ff361f3a751cbcb7 (diff)
downloadpoky-38d697203218069ffac3ac0347efcc236fd423dd.tar.gz
coreutils: Fix build with eglibc 2.16
eglibc 2.16 has removed gets so we account for that (From OE-Core rev: 965243ab5b5d992977193c444dbbbf09701467c2) 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. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch23
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.14.bb3
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch b/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch
new file mode 100644
index 0000000..4f61c92
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch
@@ -0,0 +1,23 @@
1use gets iff its defined. eglibc 2.16 removed gets
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: coreutils-8.14/lib/stdio.in.h
7===================================================================
8--- coreutils-8.14.orig/lib/stdio.in.h 2011-09-24 04:20:48.000000000 -0700
9+++ coreutils-8.14/lib/stdio.in.h 2012-07-03 10:36:19.886296576 -0700
10@@ -713,11 +713,13 @@
11 _GL_CXXALIAS_SYS (gets, char *, (char *s));
12 # undef gets
13 # endif
14+# if defined gets
15 _GL_CXXALIASWARN (gets);
16 /* It is very rare that the developer ever has full control of stdin,
17 so any use of gets warrants an unconditional warning. Assume it is
18 always declared, since it is required by C89. */
19 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
20+# endif
21 #endif
22
23
diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index 688cec9..cd0cada 100644
--- a/meta/recipes-core/coreutils/coreutils_8.14.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -7,7 +7,7 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" 9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
10PR = "r3" 10PR = "r4"
11DEPENDS = "gmp libcap" 11DEPENDS = "gmp libcap"
12DEPENDS_virtclass-native = "" 12DEPENDS_virtclass-native = ""
13 13
@@ -15,6 +15,7 @@ inherit autotools gettext
15 15
16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ 16SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
17 file://remove-usr-local-lib-from-m4.patch \ 17 file://remove-usr-local-lib-from-m4.patch \
18 file://remove-gets.patch \
18 " 19 "
19SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" 20SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a"
20SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" 21SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d"