qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:46:16 +02:00
Code

[tools] libtool: fix accidental sed invocation in libtoolize

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29839 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-01-21 09:49:53 +00:00
parent 20129f9591
commit 304c31c2ae
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
+++ 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@

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

@ -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 ()
{