summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2009-05-13 21:10:48 +0200
committerBertrand Jacquin <beber@meleeweb.net>2009-05-13 21:10:48 +0200
commit356dd478f1a37f8b8c9f9bc88c51910b70d59d88 (patch)
tree51fb17292658bc74fb68fb4d3487d1e1dc38e9e1
parentbusybox: mkswap also don't need asm/page.h (diff)
downloadpatches-356dd478f1a37f8b8c9f9bc88c51910b70d59d88.tar.gz
grep: fix pcre build
http://bugs.gentoo.org/show_bug.cgi?id=269734 http://thread.gmane.org/gmane.comp.gnu.grep.bugs/1990
-rw-r--r--grep/grep-2.5.1a-BJA-pcre-pkgconfig.diff25
-rw-r--r--grep/grep-2.5.4-BJA-pcre-pkgconfig.diff25
2 files changed, 50 insertions, 0 deletions
diff --git a/grep/grep-2.5.1a-BJA-pcre-pkgconfig.diff b/grep/grep-2.5.1a-BJA-pcre-pkgconfig.diff
new file mode 100644
index 0000000..f0b77e3
--- /dev/null
+++ b/grep/grep-2.5.1a-BJA-pcre-pkgconfig.diff
@@ -0,0 +1,25 @@
+--- configure.in.ori 2002-03-26 16:48:16.000000000 +0100
++++ configure.in 2009-05-13 20:36:31.000000000 +0200
+@@ -27,6 +27,7 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++PKG_PROG_PKG_CONFIG
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_SYS_LARGEFILE
+@@ -134,10 +135,10 @@
+
+ # support for pcre
+ if test x"$testpcre" = x"yes"; then
+- if pcre-config --cflags >/dev/null 2>&1; then
+- CFLAGS="$CFLAGS `pcre-config --cflags`"
+- LIBS="$LIBS `pcre-config --libs`"
+- fi
++ PKG_CHECK_MODULES(pcre, [libpcre])
++ CFLAGS="$CFLAGS $pcre_CFLAGS"
++ LIBS="$LIBS $pcre_LIBS"
++
+ AC_CHECK_LIB(pcre, pcre_exec)
+ fi
+
diff --git a/grep/grep-2.5.4-BJA-pcre-pkgconfig.diff b/grep/grep-2.5.4-BJA-pcre-pkgconfig.diff
new file mode 100644
index 0000000..2b9e4b1
--- /dev/null
+++ b/grep/grep-2.5.4-BJA-pcre-pkgconfig.diff
@@ -0,0 +1,25 @@
+--- configure.ac.ori 2009-02-10 05:35:21.000000000 +0100
++++ configure.ac 2009-05-13 20:53:20.000000000 +0200
+@@ -43,6 +43,7 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++PKG_PROG_PKG_CONFIG
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_SYS_LARGEFILE
+@@ -153,10 +154,10 @@
+
+ # support for pcre
+ if test x"$testpcre" = x"yes"; then
+- if pcre-config --cflags >/dev/null 2>&1; then
+- CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
+- LIBS="$LIBS `pcre-config --libs`"
+- fi
++ PKG_CHECK_MODULES(pcre, [libpcre])
++ CPPFLAGS="$CPPFLAGS $pcre_CFLAGS"
++ LIBS="$LIBS $pcre_LIBS"
++
+ AC_CHECK_LIB(pcre, pcre_exec)
+ fi
+