Author: jow Date: 2015-01-13 08:49:10 +0100 (Tue, 13 Jan 2015) New Revision: 43959
Modified: trunk/tools/libtool/Makefile trunk/tools/libtool/patches/000-relocatable.patch trunk/tools/libtool/patches/200-openwrt-branding.patch Log: 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 <[email protected]> Modified: trunk/tools/libtool/Makefile =================================================================== --- trunk/tools/libtool/Makefile 2015-01-13 07:49:01 UTC (rev 43958) +++ trunk/tools/libtool/Makefile 2015-01-13 07:49:10 UTC (rev 43959) @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -20,6 +20,12 @@ HOST_CONFIGURE_VARS += \ lt_cv_sys_dlsearch_path="" +define Host/Prepare + $(call Host/Prepare/Default) + (cd $(STAGING_DIR_HOST)/share/aclocal/ && rm -f libtool.m4 ltdl.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4) + (cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap) +endef + define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install $(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(STAGING_DIR_HOST)/bin/libtool Modified: trunk/tools/libtool/patches/000-relocatable.patch =================================================================== --- trunk/tools/libtool/patches/000-relocatable.patch 2015-01-13 07:49:01 UTC (rev 43958) +++ trunk/tools/libtool/patches/000-relocatable.patch 2015-01-13 07:49:10 UTC (rev 43959) @@ -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//"} Modified: trunk/tools/libtool/patches/200-openwrt-branding.patch =================================================================== --- trunk/tools/libtool/patches/200-openwrt-branding.patch 2015-01-13 07:49:01 UTC (rev 43958) +++ trunk/tools/libtool/patches/200-openwrt-branding.patch 2015-01-13 07:49:10 UTC (rev 43959) @@ -1,6 +1,6 @@ --- a/libltdl/config/general.m4sh +++ b/libltdl/config/general.m4sh -@@ -352,7 +352,7 @@ opt_warning=: +@@ -356,7 +356,7 @@ opt_warning=: # name if it has been set yet. func_echo () { @@ -9,7 +9,7 @@ } # func_verbose arg... -@@ -378,14 +378,14 @@ func_echo_all () +@@ -382,14 +382,14 @@ func_echo_all () # Echo program name prefixed message to standard error. func_error () { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
