KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libtool: fix accidental sed invocation in libtoolize

Browse source 
SVN-Revision: 29839
This commit is contained in:
Jo-Philipp Wich 2012-01-21 09:49:53 +00:00
parent 4828e8ff23
commit ab2f3dc034
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/libtool/patches/000-relocatable.patch
View file

@ -11,16 +11,20 @@
--- a/libtoolize.in --- a/libtoolize.in
+++ b/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"} : ${MKDIR="mkdir"}
: ${MV="mv -f"} : ${MV="mv -f"}
: ${RM="rm -f"} : ${RM="rm -f"}
-: ${SED="@SED@"} -: ${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}"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"} : ${Xsed="$SED -e 1s/^X//"}
@@ -2476,10 +2476,17 @@ func_check_macros () @@ -2476,10 +2480,17 @@ func_check_macros ()
# Locations for important files: # Locations for important files:
prefix=@prefix@ prefix=@prefix@

4
tools/libtool/patches/200-openwrt-branding.patch
View file

@ -56,7 +56,7 @@
: :
--- a/libtoolize.in --- a/libtoolize.in
+++ b/libtoolize.in +++ b/libtoolize.in
@@ -633,7 +633,7 @@ opt_warning=: @@ -637,7 +637,7 @@ opt_warning=:
# name if it has been set yet. # name if it has been set yet.
func_echo () func_echo ()
{ {
@ -65,7 +65,7 @@
} }
# func_verbose arg... # 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. # Echo program name prefixed message to standard error.
func_error () func_error ()
{ {