From 38d697203218069ffac3ac0347efcc236fd423dd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 3 Jul 2012 23:43:06 -0700 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie Resolved merge conflicts with denzil branch. Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- .../coreutils/coreutils-8.14/remove-gets.patch | 23 ++++++++++++++++++++++ meta/recipes-core/coreutils/coreutils_8.14.bb | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch 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 0000000000..4f61c92b15 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.14/remove-gets.patch @@ -0,0 +1,23 @@ +use gets iff its defined. eglibc 2.16 removed gets + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Index: coreutils-8.14/lib/stdio.in.h +=================================================================== +--- coreutils-8.14.orig/lib/stdio.in.h 2011-09-24 04:20:48.000000000 -0700 ++++ coreutils-8.14/lib/stdio.in.h 2012-07-03 10:36:19.886296576 -0700 +@@ -713,11 +713,13 @@ + _GL_CXXALIAS_SYS (gets, char *, (char *s)); + # undef gets + # endif ++# if defined gets + _GL_CXXALIASWARN (gets); + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++# endif + #endif + + diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb index 688cec9458..cd0cada2bb 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" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" -PR = "r3" +PR = "r4" DEPENDS = "gmp libcap" DEPENDS_virtclass-native = "" @@ -15,6 +15,7 @@ inherit autotools gettext SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ + file://remove-gets.patch \ " SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" -- cgit v1.2.3-54-g00ecf