summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-03 23:44:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:54:00 +0100
commit34d1281c0edfaad8b009943583730ef45b5545eb (patch)
treee7175a1b5ff65d3f76aa718820e3d568fd9e99ec
parent423d316f1900ece1496356ece9d2482a2334abfe (diff)
downloadpoky-34d1281c0edfaad8b009943583730ef45b5545eb.tar.gz
diffutils: Fix build with eglibc 2.16
eglibc 2.16 has removed gets so we account for that (From OE-Core rev: bd47833dea9e1b39ca19b02f06ba9194c6d52be8) 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 0000000000..58ed62dfc1
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch
@@ -0,0 +1,22 @@
1check for gets before using it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5Index: diffutils-3.2/lib/stdio.in.h
6===================================================================
7--- diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.000000000 -0700
8+++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700
9@@ -693,11 +693,13 @@
10 _GL_CXXALIAS_SYS (gets, char *, (char *s));
11 # undef gets
12 # endif
13+# if defined gets
14 _GL_CXXALIASWARN (gets);
15 /* It is very rare that the developer ever has full control of stdin,
16 so any use of gets warrants an unconditional warning. Assume it is
17 always declared, since it is required by C89. */
18 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
19+# endif
20 #endif
21
22
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index 174866c1c1..c46863d3a7 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"
5LICENSE = "GPLv3+" 5LICENSE = "GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" 10SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \
11 file://remove-gets.patch \
12 "
11 13
12inherit autotools update-alternatives gettext 14inherit autotools update-alternatives gettext
13 15