From 304c31c2aeacfde3fe6a5305632c8709376a2215 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 21 Jan 2012 09:49:53 +0000
Subject: [tools] libtool: fix accidental sed invocation in libtoolize

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29839 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 tools/libtool/patches/000-relocatable.patch      | 10 +++++++---
 tools/libtool/patches/200-openwrt-branding.patch |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'tools/libtool')

diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch
index d7f4fef00..c36b80658 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 e8e82ff7b..56ea8bf21 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 ()
  {
-- 
cgit v1.2.3