tools: libtool relocatable fixes

Make sure that libtool and libtoolize call grep relative to
$STAGING_DIR as well.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43960

2 files changed, 50 insertions, 9 deletions

diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch
index fcc07f2..55265fe 100644
--- a/tools/libtool/patches/000-relocatable.patch
+++ b/tools/libtool/patches/000-relocatable.patch
@@ -1,34 +1,62 @@
 --- a/libltdl/config/general.m4sh
 +++ b/libltdl/config/general.m4sh
-@@ -53,7 +53,11 @@ test "${ECHO+set}" = set || ECHO=${as_ec
+@@ -45,15 +45,22 @@ progpath="$0"
+ M4SH_VERBATIM([[
+ : ${CP="cp -f"}
+ test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+-: ${EGREP="@EGREP@"}
+-: ${FGREP="@FGREP@"}
+-: ${GREP="@GREP@"}
+ : ${LN_S="@LN_S@"}
+ : ${MAKE="make"}
  : ${MKDIR="mkdir"}
  : ${MV="mv -f"}
  : ${RM="rm -f"}
 -: ${SED="@SED@"}
 +if test -n "$STAGING_DIR"; then
-+       : ${SED="$STAGING_DIR/../host/bin/sed"}
++	: ${EGREP="$STAGING_DIR/../host/bin/grep -E"}
++	: ${FGREP="$STAGING_DIR/../host/bin/grep -F"}
++	: ${GREP="$STAGING_DIR/../host/bin/grep"}
++	: ${SED="$STAGING_DIR/../host/bin/sed"}
 +else
-+       : ${SED="@SED@"}
++	: ${EGREP="@EGREP@"}
++	: ${FGREP="@FGREP@"}
++	: ${GREP="@GREP@"}
++	: ${SED="@SED@"}
 +fi
  : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
  : ${Xsed="$SED -e 1s/^X//"}
  
 --- a/libtoolize.in
 +++ b/libtoolize.in
-@@ -334,7 +334,11 @@ test "${ECHO+set}" = set || ECHO=${as_ec
+@@ -326,15 +326,22 @@ as_unset=as_fn_unset
+ 
+ : ${CP="cp -f"}
+ test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+-: ${EGREP="@EGREP@"}
+-: ${FGREP="@FGREP@"}
+-: ${GREP="@GREP@"}
+ : ${LN_S="@LN_S@"}
+ : ${MAKE="make"}
  : ${MKDIR="mkdir"}
  : ${MV="mv -f"}
  : ${RM="rm -f"}
 -: ${SED="@SED@"}
 +if test -n "$STAGING_DIR"; then
++	: ${EGREP="$STAGING_DIR/../host/bin/grep -E"}
++	: ${FGREP="$STAGING_DIR/../host/bin/grep -F"}
++	: ${GREP="$STAGING_DIR/../host/bin/grep"}
 +	: ${SED="$STAGING_DIR/../host/bin/sed"}
 +else
++	: ${EGREP="@EGREP@"}
++	: ${FGREP="@FGREP@"}
++	: ${GREP="@GREP@"}
 +	: ${SED="@SED@"}
 +fi
  : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
  : ${Xsed="$SED -e 1s/^X//"}
  
-@@ -2476,10 +2480,17 @@ func_check_macros ()
+@@ -2476,10 +2483,17 @@ func_check_macros ()
  
    # Locations for important files:
    prefix=@prefix@
@@ -87,6 +115,19 @@
  _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
  _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
  
+@@ -7509,9 +7508,9 @@ m4_defun([_LT_DECL_EGREP],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_REQUIRE([AC_PROG_FGREP])dnl
+ test -z "$GREP" && GREP=grep
+-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+-_LT_DECL([], [EGREP], [1], [An ERE matcher])
+-_LT_DECL([], [FGREP], [1], [A literal string matcher])
++_LT_DECL([], [GREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep"], [A grep program that handles long lines])
++_LT_DECL([], [EGREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep -E"], [An ERE matcher])
++_LT_DECL([], [FGREP], ["\${STAGING_DIR:-$STAGING_DIR}/../host/bin/grep -F"], [A literal string matcher])
+ dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+ AC_SUBST([GREP])
+ ])
 @@ -7544,9 +7543,8 @@ AC_SUBST([DLLTOOL])
  # as few characters as possible.  Prefer GNU sed if found.
  m4_defun([_LT_DECL_SED],
diff --git a/tools/libtool/patches/200-openwrt-branding.patch b/tools/libtool/patches/200-openwrt-branding.patch
index 2dc1c42..dd3e3d6 100644
--- a/tools/libtool/patches/200-openwrt-branding.patch
+++ b/tools/libtool/patches/200-openwrt-branding.patch
@@ -1,6 +1,6 @@
 --- a/libltdl/config/general.m4sh
 +++ b/libltdl/config/general.m4sh
-@@ -356,7 +356,7 @@ opt_warning=:
+@@ -359,7 +359,7 @@ opt_warning=:
  # name if it has been set yet.
  func_echo ()
  {
@@ -9,7 +9,7 @@
  }
  
  # func_verbose arg...
-@@ -382,14 +382,14 @@ func_echo_all ()
+@@ -385,14 +385,14 @@ func_echo_all ()
  # Echo program name prefixed message to standard error.
  func_error ()
  {
@@ -56,7 +56,7 @@
      :
 --- a/libtoolize.in
 +++ b/libtoolize.in
-@@ -637,7 +637,7 @@ opt_warning=:
+@@ -640,7 +640,7 @@ opt_warning=:
  # name if it has been set yet.
  func_echo ()
  {
@@ -65,7 +65,7 @@
  }
  
  # func_verbose arg...
-@@ -663,14 +663,14 @@ func_echo_all ()
+@@ -666,14 +666,14 @@ func_echo_all ()
  # Echo program name prefixed message to standard error.
  func_error ()
  {