perl 5.8.7: Use grep -I to ignore binary files instead of looking at

the output message from grep. The output message could change
depending on the LOCALE which would break the current test. Make it
DEPEND on grep-native to ensure we get the gnu version of grep which
is needed for -I to work. As per bug #1439.

diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 1b69cf0..0c69458 100644 (file)
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -1,5 +1,8 @@
 MAINTAINER="David Karlstrom <daka@thg.se>"
 
+# We need gnugrep (for -I)
+DEPENDS_append += " grep-native"
+
 require perl.inc
 
 SRC_URI += "file://config.sh-armeb-linux \
@@ -53,7 +56,7 @@ do_configure() {
        sed -i -e "s%/usr/include/%${STAGING_INCDIR}/%g" config.sh-${TARGET_ARCH}-${TARGET_OS}
 
        #These are strewn all over the source tree
-       for foo in `grep -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | grep -v "^Binary file .* matches$" | cut -f 1 -d ":"` ; do
+       for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
                echo Fixing: $foo
                sed -e "s%/usr/include/%${STAGING_INCDIR}/%g" -i $foo
        done