diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-13 10:23:44 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-13 10:23:44 +0000 |
| commit | 2b366700b0c9dd2f903bdcbdc1fd1b1c8989a50d (patch) | |
| tree | c7b9dddadc9946a7132532d921d8e0e762bc489c /tools/libtool/patches/000-relocatable.patch | |
| parent | 90283e410bd6227125427f0f240b87ecd1cc4e1c (diff) | |
| download | upstream-2b366700b0c9dd2f903bdcbdc1fd1b1c8989a50d.tar.gz upstream-2b366700b0c9dd2f903bdcbdc1fd1b1c8989a50d.tar.bz2 upstream-2b366700b0c9dd2f903bdcbdc1fd1b1c8989a50d.zip | |
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
Diffstat (limited to 'tools/libtool/patches/000-relocatable.patch')
| -rw-r--r-- | tools/libtool/patches/000-relocatable.patch | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch index fcc07f2790..55265fe533 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], |