From 90283e410bd6227125427f0f240b87ecd1cc4e1c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 13 Jan 2015 07:49:10 +0000 Subject: tools: bootstrap libtool to pickup the correct in-tree automake Also fix 000-relocatable.patch to avoid accidential sed invocations in bootstrap. Signed-off-by: Jo-Philipp Wich SVN-Revision: 43959 --- tools/libtool/patches/000-relocatable.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/libtool/patches/000-relocatable.patch') diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch index c36b806584..fcc07f2790 100644 --- a/tools/libtool/patches/000-relocatable.patch +++ b/tools/libtool/patches/000-relocatable.patch @@ -1,11 +1,15 @@ --- a/libltdl/config/general.m4sh +++ b/libltdl/config/general.m4sh -@@ -53,7 +53,7 @@ test "${ECHO+set}" = set || ECHO=${as_ec +@@ -53,7 +53,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//"} -- cgit v1.2.3