diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-21 09:49:53 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-21 09:49:53 +0000 |
| commit | ab2f3dc0343d17035142115939dcf555beef32e5 (patch) | |
| tree | 3a8100f9b908bdd921d53b0e2c21595067d2b2fb /tools | |
| parent | 4828e8ff2315da37b2c05ed8598587c2e5684f1f (diff) | |
| download | upstream-ab2f3dc0343d17035142115939dcf555beef32e5.tar.gz upstream-ab2f3dc0343d17035142115939dcf555beef32e5.tar.bz2 upstream-ab2f3dc0343d17035142115939dcf555beef32e5.zip | |
libtool: fix accidental sed invocation in libtoolize
SVN-Revision: 29839
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libtool/patches/000-relocatable.patch | 10 | ||||
| -rw-r--r-- | tools/libtool/patches/200-openwrt-branding.patch | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch index d7f4fef005..c36b806584 100644 --- a/tools/libtool/patches/000-relocatable.patch +++ b/tools/libtool/patches/000-relocatable.patch @@ -11,16 +11,20 @@ --- a/libtoolize.in +++ b/libtoolize.in -@@ -334,7 +334,7 @@ test "${ECHO+set}" = set || ECHO=${as_ec +@@ -334,7 +334,11 @@ test "${ECHO+set}" = set || ECHO=${as_ec : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="@SED@"} -+test "${STAGING_DIR+set}" = set && ${SED="$STAGING_DIR/../host/bin/sed"} || ${SED="@SED@"} ++if test -n "$STAGING_DIR"; then ++ : ${SED="$STAGING_DIR/../host/bin/sed"} ++else ++ : ${SED="@SED@"} ++fi : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} -@@ -2476,10 +2476,17 @@ func_check_macros () +@@ -2476,10 +2480,17 @@ func_check_macros () # Locations for important files: prefix=@prefix@ diff --git a/tools/libtool/patches/200-openwrt-branding.patch b/tools/libtool/patches/200-openwrt-branding.patch index e8e82ff7b4..56ea8bf213 100644 --- a/tools/libtool/patches/200-openwrt-branding.patch +++ b/tools/libtool/patches/200-openwrt-branding.patch @@ -56,7 +56,7 @@ : --- a/libtoolize.in +++ b/libtoolize.in -@@ -633,7 +633,7 @@ opt_warning=: +@@ -637,7 +637,7 @@ opt_warning=: # name if it has been set yet. func_echo () { @@ -65,7 +65,7 @@ } # func_verbose arg... -@@ -659,14 +659,14 @@ func_echo_all () +@@ -663,14 +663,14 @@ func_echo_all () # Echo program name prefixed message to standard error. func_error () { |