aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-03 23:44:43 -0700
committerScott Garman <scott.a.garman@intel.com>2012-12-12 20:01:16 -0800
commitb6bcd4e26e94364939c8874db90e64fbb242e841 (patch)
treee6950b1f5760e082467e26c1567bedc9c1727594
parent965243ab5b5d992977193c444dbbbf09701467c2 (diff)
downloadopenembedded-core-b6bcd4e26e94364939c8874db90e64fbb242e841.zip
openembedded-core-b6bcd4e26e94364939c8874db90e64fbb242e841.tar.gz
openembedded-core-b6bcd4e26e94364939c8874db90e64fbb242e841.tar.bz2
diffutils: Fix build with eglibc 2.16
eglibc 2.16 has removed gets so we account for that 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>
-rw-r--r--meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch22
-rw-r--r--meta/recipes-extended/diffutils/diffutils_3.2.bb6
2 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch b/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch
new file mode 100644
index 0000000..58ed62d
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch
@@ -0,0 +1,22 @@
+check for gets before using it
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+Index: diffutils-3.2/lib/stdio.in.h
+===================================================================
+--- diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.000000000 -0700
++++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700
+@@ -693,11 +693,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-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index 174866c..c46863d 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.2.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.2.bb
@@ -5,9 +5,11 @@ SECTION = "base"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r0"
+PR = "r1"
-SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \
+ file://remove-gets.patch \
+ "
inherit autotools update-alternatives gettext