summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/grep
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2013-03-12 09:56:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-20 17:25:36 +0000
commit4ca3a19c6fb93a6e85017f7ae465b5d2eba9463e (patch)
tree18f2217a132f7de99edbaf49d56d82dc224ab308 /meta/recipes-extended/grep
parent6aacf7b2c571bf1004caaa9883e58c1f22e37fec (diff)
downloadopenembedded-core-4ca3a19c6fb93a6e85017f7ae465b5d2eba9463e.tar.gz
openembedded-core-4ca3a19c6fb93a6e85017f7ae465b5d2eba9463e.tar.bz2
openembedded-core-4ca3a19c6fb93a6e85017f7ae465b5d2eba9463e.zip
grep: Always use locale.h
The changes in the grep 2.5 configuration always leave out HAVE_LOCALE_H - it has been removed from other files, but not from everywhere. This leads to a crash in certain configurations where the size of int is not the size of pointer; this happens because setlocale() is used while being undeclared. [YOCTO #3959] Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/grep')
-rw-r--r--meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch17
-rw-r--r--meta/recipes-extended/grep/grep_2.5.1a.bb1
2 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch b/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
new file mode 100644
index 0000000000..3b91520fb2
--- /dev/null
+++ b/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
@@ -0,0 +1,17 @@
+Always use locale.h as HAVE_LOCALE_H is no longer handled by ./configure
+Upstream-Status: Inappropriate [ old version that will not be maintained ]
+Signed-off-by: Alex DAMIAN <alexandru.damian@intel.com>
+
+diff --recursive --unified grep-2.5.1a-orig/lib/hard-locale.c grep-2.5.1a/lib/hard-locale.c
+--- grep-2.5.1a-orig/lib/hard-locale.c 2001-03-04 07:33:12.000000000 +0200
++++ grep-2.5.1a/lib/hard-locale.c 2013-03-11 17:05:52.086444891 +0200
+@@ -38,9 +38,7 @@
+ # endif
+ #endif
+
+-#if HAVE_LOCALE_H
+ # include <locale.h>
+-#endif
+
+ #if HAVE_STRING_H
+ # include <string.h>
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index ebcbe23ca0..d6386edb3f 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch \
file://grep_fix_for_automake-1.12.patch \
file://gettext.patch \
+ file://fix64-int-to-pointer.patch \
file://Makevars \
"