Changeset 29839


Ignore:
Timestamp:
2012-01-21T10:49:53+01:00 (6 years ago)
Author:
jow
Message:

[tools] libtool: fix accidental sed invocation in libtoolize

Location:
trunk/tools/libtool/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/libtool/patches/000-relocatable.patch

    r29826 r29839  
    1212--- a/libtoolize.in 
    1313+++ b/libtoolize.in 
    14 @@ -334,7 +334,7 @@ test "${ECHO+set}" = set || ECHO=${as_ec 
     14@@ -334,7 +334,11 @@ test "${ECHO+set}" = set || ECHO=${as_ec 
    1515 : ${MKDIR="mkdir"} 
    1616 : ${MV="mv -f"} 
    1717 : ${RM="rm -f"} 
    1818-: ${SED="@SED@"} 
    19 +test "${STAGING_DIR+set}" = set && ${SED="$STAGING_DIR/../host/bin/sed"} || ${SED="@SED@"} 
     19+if test -n "$STAGING_DIR"; then 
     20+       : ${SED="$STAGING_DIR/../host/bin/sed"} 
     21+else 
     22+       : ${SED="@SED@"} 
     23+fi 
    2024 : ${SHELL="${CONFIG_SHELL-/bin/sh}"} 
    2125 : ${Xsed="$SED -e 1s/^X//"} 
    2226  
    23 @@ -2476,10 +2476,17 @@ func_check_macros () 
     27@@ -2476,10 +2480,17 @@ func_check_macros () 
    2428  
    2529   # Locations for important files: 
  • trunk/tools/libtool/patches/200-openwrt-branding.patch

    r24673 r29839  
    5757--- a/libtoolize.in 
    5858+++ b/libtoolize.in 
    59 @@ -633,7 +633,7 @@ opt_warning=: 
     59@@ -637,7 +637,7 @@ opt_warning=: 
    6060 # name if it has been set yet. 
    6161 func_echo () 
     
    6666  
    6767 # func_verbose arg... 
    68 @@ -659,14 +659,14 @@ func_echo_all () 
     68@@ -663,14 +663,14 @@ func_echo_all () 
    6969 # Echo program name prefixed message to standard error. 
    7070 func_error () 
Note: See TracChangeset for help on using the changeset viewer.