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]

(From OE-Core rev: 4ca3a19c6fb93a6e85017f7ae465b5d2eba9463e)

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>
This commit is contained in:
Alexandru DAMIAN 2013-03-12 09:56:02 +00:00 committed by Richard Purdie
parent 998ec3bbcc
commit e7f7fcb831
2 changed files with 18 additions and 0 deletions

View File

@ -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>

View File

@ -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 \
"