summaryrefslogtreecommitdiff
path: root/meta/packages/libtool/libtool-2.2.2
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/libtool/libtool-2.2.2')
-rw-r--r--meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch68
-rw-r--r--meta/packages/libtool/libtool-2.2.2/add_dolt.patch12
-rw-r--r--meta/packages/libtool/libtool-2.2.2/cross_compile.patch55
-rw-r--r--meta/packages/libtool/libtool-2.2.2/dolt.m4129
-rw-r--r--meta/packages/libtool/libtool-2.2.2/fix_static.patch129
-rw-r--r--meta/packages/libtool/libtool-2.2.2/prefix.patch103
6 files changed, 0 insertions, 496 deletions
diff --git a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
deleted file mode 100644
index 4e69e2cce..000000000
--- a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 92e15986a43a8009decffc4d5d290272449487a4 Mon Sep 17 00:00:00 2001
-From: Peter O'Gorman <peter@pogma.com>
-Date: Thu, 1 May 2008 12:40:24 -0500
-Subject: [PATCH] Use AC_CHECK_TOOL for otool and otool64.
-
-* libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
-* libltdl/config/ltmain.m4sh (func_mode_link): Use.
-Reported by Richard Purdie <rpurdie@rpsys.net>
----
- ChangeLog | 7 +++++++
- libltdl/config/ltmain.m4sh | 6 ++----
- libltdl/m4/libtool.m4 | 6 ++++++
- 3 files changed, 15 insertions(+), 4 deletions(-)
-
-Index: libtool-2.2.2/ChangeLog
-===================================================================
---- libtool-2.2.2.orig/ChangeLog 2008-05-01 21:34:42.000000000 +0100
-+++ libtool-2.2.2/ChangeLog 2008-05-01 21:35:47.000000000 +0100
-@@ -1,3 +1,10 @@
-+2008-05-01 Peter O'Gorman <peter@pogma.com>
-+
-+ Use AC_CHECK_TOOL for otool and otool64.
-+ * libltdl/m4/libtool.m4 (_LT_REQUIRED_DARWIN_CHECKS): Check.
-+ * libltdl/config/ltmain.m4sh (func_mode_link): Use.
-+ Reported by Richard Purdie <rpurdie@rpsys.net>
-+
- 2008-04-01 Gary V. Vaughan <gary@gnu.arg>
-
- GNU Libtool 2.2.2 was released.
-Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 21:34:42.000000000 +0100
-+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 21:34:48.000000000 +0100
-@@ -4961,11 +4961,9 @@
- done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
-- darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
-- darwin_install_name=`$ECHO $darwin_install_name`
-+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
- if test -z "$darwin_install_name"; then
-- darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
-- darwin_install_name=`$ECHO $darwin_install_name`
-+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
- fi
- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-Index: libtool-2.2.2/libltdl/m4/libtool.m4
-===================================================================
---- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-05-01 21:34:42.000000000 +0100
-+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-05-01 21:36:48.000000000 +0100
-@@ -893,10 +893,16 @@
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+ AC_CHECK_TOOL([OTOOL], [otool], [:])
-+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
- _LT_DECL([], [DSYMUTIL], [1],
- [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
- _LT_DECL([], [NMEDIT], [1],
- [Tool to change global to local symbols on Mac OS X])
-+ _LT_DECL([], [OTOOL], [1],
-+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-+ _LT_DECL([], [OTOOL64], [1],
-+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
- [lt_cv_apple_cc_single_mod=no
diff --git a/meta/packages/libtool/libtool-2.2.2/add_dolt.patch b/meta/packages/libtool/libtool-2.2.2/add_dolt.patch
deleted file mode 100644
index 2c5df9603..000000000
--- a/meta/packages/libtool/libtool-2.2.2/add_dolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libtool-2.2.2/libltdl/m4/libtool.m4
-===================================================================
---- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:40:30.000000000 +0100
-+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-04-13 23:38:45.000000000 +0100
-@@ -97,6 +97,7 @@
-
- # Only expand once:
- m4_define([LT_INIT])
-+DOLT
- ])# LT_INIT
-
- # Old names:
diff --git a/meta/packages/libtool/libtool-2.2.2/cross_compile.patch b/meta/packages/libtool/libtool-2.2.2/cross_compile.patch
deleted file mode 100644
index b4bacbd12..000000000
--- a/meta/packages/libtool/libtool-2.2.2/cross_compile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Tweaks to make cross-compiling work combined and updated from various
-older patches, some by Chris Larson.
-Not upstreable in this form.
-
-RP - 01/05/2008
-
-Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 21:48:42.000000000 +0100
-+++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 21:51:41.000000000 +0100
-@@ -4454,8 +4454,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -4825,8 +4831,6 @@
- add="$libdir/$linklib"
- fi
- else
-- # We cannot seem to hardcode it, guess we'll fake it.
-- add_dir="-L$libdir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
- case $libdir in
-@@ -4972,7 +4976,17 @@
- fi
- ;;
- *)
-- path="-L$absdir/$objdir"
-+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
-+ # preferring $objdir. RP 31/04/2008
-+ if test -f "$absdir/$objdir/$depdepl" ; then
-+ depdepl="$absdir/$objdir/$depdepl"
-+ path="-L$absdir/$objdir"
-+ elif test -f "$absdir/$depdepl" ; then
-+ depdepl="$absdir/$depdepl"
-+ path="-L$absdir"
-+ else
-+ path="-L$absdir/$objdir"
-+ fi
- ;;
- esac
- else
diff --git a/meta/packages/libtool/libtool-2.2.2/dolt.m4 b/meta/packages/libtool/libtool-2.2.2/dolt.m4
deleted file mode 100644
index 9bedecf27..000000000
--- a/meta/packages/libtool/libtool-2.2.2/dolt.m4
+++ /dev/null
@@ -1,129 +0,0 @@
-dnl dolt, a replacement for libtool
-dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org>
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-dnl
-dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
-dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
-dnl installed when running autoconf on your project.
-
-AC_DEFUN([DOLT], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-# dolt, a replacement for libtool
-# Josh Triplett <josh@freedesktop.org>
-AC_PATH_PROG(DOLT_BASH, bash)
-AC_MSG_CHECKING([if dolt supports this host])
-dolt_supported=yes
-if test x$DOLT_BASH = x; then
- AC_MSG_ERROR([dolt: Bash not found, fatal error])
-fi
-if test x$GCC != xyes; then
- AC_MSG_ERROR([dolt: gcc not found, fatal error])
-fi
-case $host in
-i?86-*-linux*|x86_64-*-linux*|arm-*-linux*) ;;
-*) AC_MSG_ERROR([dolt: incompatible host, fatal error]) ;;
-esac
-AC_MSG_RESULT([yes, replacing libtool])
-
-dnl Start writing out doltcompile.
- cat <<__DOLTCOMPILE__EOF__ >doltcompile
-#!$DOLT_BASH
-__DOLTCOMPILE__EOF__
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-args=("$[]@")
-for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
- if test x"${args@<:@$arg@:>@}" = x-o ; then
- objarg=$((arg+1))
- break
- fi
-done
-if test x$objarg = x ; then
- echo 'Error: no -o on compiler command line' 1>&2
- exit 1
-fi
-lo="${args@<:@$objarg@:>@}"
-obj="${lo%.lo}"
-if test x"$lo" = x"$obj" ; then
- echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
- exit 1
-fi
-objbase="${obj##*/}"
-__DOLTCOMPILE__EOF__
-
-dnl Write out shared compilation code.
- if test x$enable_shared = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-libobjdir="${obj%$objbase}.libs"
-if test ! -d "$libobjdir" ; then
- mkdir "$libobjdir"
- mkdir_ret=$?
- if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
- exit $mkdir_ret
- fi
-fi
-pic_object="$libobjdir/$objbase.o"
-args@<:@$objarg@:>@="$pic_object"
-"${args@<:@@@:>@}" -fPIC -DPIC
-__DOLTCOMPILE__EOF__
- fi
-
-dnl Write out static compilation code.
-dnl Avoid duplicate compiler output if also building shared objects.
- if test x$enable_static = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-non_pic_object="$obj.o"
-args@<:@$objarg@:>@="$non_pic_object"
-__DOLTCOMPILE__EOF__
- if test x$enable_shared = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}" >/dev/null 2>&1
-__DOLTCOMPILE__EOF__
- else
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}"
-__DOLTCOMPILE__EOF__
- fi
- fi
-
-dnl Write out the code to write the .lo file.
-dnl The second line of the .lo file must match "^# Generated by .*libtool"
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-{
-echo "# $lo - a libtool object file"
-echo "# Generated by doltcompile, not libtool"
-__DOLTCOMPILE__EOF__
-
- if test x$enable_shared = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "pic_object='$pic_object'"
-__DOLTCOMPILE__EOF__
- else
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo pic_object=none
-__DOLTCOMPILE__EOF__
- fi
-
- if test x$enable_static = xyes; then
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "non_pic_object='$non_pic_object'"
-__DOLTCOMPILE__EOF__
- else
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo non_pic_object=none
-__DOLTCOMPILE__EOF__
- fi
-
- cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-} > "$lo"
-__DOLTCOMPILE__EOF__
-
-dnl Done writing out doltcompile; substitute it for libtool compilation.
- chmod +x doltcompile
- LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
- AC_SUBST(LTCOMPILE)
- LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
- AC_SUBST(LTCXXCOMPILE)
-# end dolt
-])
diff --git a/meta/packages/libtool/libtool-2.2.2/fix_static.patch b/meta/packages/libtool/libtool-2.2.2/fix_static.patch
deleted file mode 100644
index 10803c7d8..000000000
--- a/meta/packages/libtool/libtool-2.2.2/fix_static.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From Ralf.Wildenhues@gmx.de Tue Apr 22 20:44:16 2008
-Return-Path: <Ralf.Wildenhues@gmx.de>
-X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on tim.rpsys.net
-X-Spam-Level:
-X-Spam-Status: No, score=-3.0 required=5.0 tests=AWL,BAYES_00 autolearn=ham
- version=3.2.4
-Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net
- (8.13.6/8.13.8) with ESMTP id m3MJiGXW016935 for <rpurdie@[127.0.0.1]>;
- Tue, 22 Apr 2008 20:44:16 +0100
-Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net
- [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 16773-04 for
- <rpurdie@[127.0.0.1]>; Tue, 22 Apr 2008 20:44:07 +0100 (BST)
-Received: from merkur.ins.uni-bonn.de (merkur.ins.uni-bonn.de
- [131.220.223.13]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id
- m3MJi2sT016913 for <rpurdie@rpsys.net>; Tue, 22 Apr 2008 20:44:02 +0100
-Received: from localhost.localdomain (xdsl-87-79-251-12.netcologne.de
- [87.79.251.12]) by merkur.ins.uni-bonn.de (Postfix) with ESMTP id
- 54F1C400002D4; Tue, 22 Apr 2008 21:43:56 +0200 (CEST)
-Received: from ralf by localhost.localdomain with local (Exim 4.63)
- (envelope-from <Ralf.Wildenhues@gmx.de>) id 1JoOP7-0007yr-Aw; Tue, 22 Apr
- 2008 21:43:49 +0200
-Date: Tue, 22 Apr 2008 21:43:49 +0200
-From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-To: Richard Purdie <rpurdie@rpsys.net>, libtool-patches@gnu.org
-Cc: libtool@gnu.org
-Subject: Re: libtool 2.2.2, ccache and -all-static
-Message-ID: <20080422194348.GE5035@ins.uni-bonn.de>
-Mail-Followup-To: Richard Purdie <rpurdie@rpsys.net>,
- libtool-patches@gnu.org, libtool@gnu.org
-References: <1208860190.5479.8.camel@dax.rpnet.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <1208860190.5479.8.camel@dax.rpnet.com>
-Organization: Department of Numerical Simulation, University of Bonn
-User-Agent: Mutt/1.5.17+20080114 (2008-01-14)
-X-Virus-Scanned: amavisd-new at rpsys.net
-X-Evolution-Source: imap://richard@tim.rpsys.net/
-Content-Transfer-Encoding: 8bit
-
-Hi Richard,
-
-* Richard Purdie wrote on Tue, Apr 22, 2008 at 12:29:50PM CEST:
->
-> I've noticed another problem with two packages in poky, prelink and
-> libvorbis. Both packages have areas where LDFLAGS="-all-static" is used.
->
-> The problem comes about since Poky sets CC to "ccache gcc", then libtool
-> puts the -static flag between ccache and gcc.
-
-Thanks for the bug report, and especially for providing an example to
-reproduce it!
-
-> libtool: link: ccache -static gcc -O20 -ffast-math -D_REENTRANT -fsigned-char -DUSE_MEMORY_H -o decoder_example decoder_example.o ../lib/.libs/libvorbis.a -lm /usr/lib/libogg.a
-
-Confirmed. Fixed as below, committed, put you in THANKS.
-
-Cheers,
-Ralf
-
-2008-04-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
- Fix regression over 1.5.26 with ccache $CC -all-static.
- * libltdl/config/ltmain.m4sh (func_mode_link): Add
- $link_static_flag to compile_command and link_command only
- later, instead of right after a possible compiler wrapper.
- * tests/static.at (ccache -all-static): New test.
- * THANKS: Update.
- Report by Richard Purdie.
-
-diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
-index ff1e50d..ac334dc 100644
---- a/libltdl/config/ltmain.m4sh
-+++ b/libltdl/config/ltmain.m4sh
-@@ -3160,9 +3160,6 @@ func_mode_link ()
- fi
- if test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
-- # See comment for -static flag below, for more details.
-- func_append compile_command " $link_static_flag"
-- func_append finalize_command " $link_static_flag"
- fi
- prefer_static_libs=yes
- ;;
-@@ -3450,7 +3447,11 @@ func_mode_link ()
-
- case $arg in
- -all-static)
-- # The effects of -all-static are defined in a previous loop.
-+ if test -n "$link_static_flag"; then
-+ # See comment for -static flag below, for more details.
-+ func_append compile_command " $link_static_flag"
-+ func_append finalize_command " $link_static_flag"
-+ fi
- continue
- ;;
-
-diff --git a/tests/static.at b/tests/static.at
-index 74b1c63..1a51d0d 100644
---- a/tests/static.at
-+++ b/tests/static.at
-@@ -352,3 +352,26 @@ for withdep in no yes; do
- done
-
- AT_CLEANUP
-+
-+
-+AT_SETUP([ccache -all-static])
-+
-+AT_DATA([ccache],
-+[[#! /bin/sh
-+# poor man's ccache clone
-+case $1 in
-+-*) echo "bogus argument: $1" >&2; exit 1 ;;
-+esac
-+exec "$@"
-+]])
-+chmod +x ./ccache
-+
-+AT_DATA([a.c],
-+[[int main(void) { return 0; }
-+]])
-+
-+AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore])
-+AT_CHECK([$LIBTOOL --mode=link --tag=CC ./ccache $CC $CFLAGS $LDFLAGS -all-static a.$OBJEXT -o a],
-+ [], [ignore])
-+
-+AT_CLEANUP
-
diff --git a/meta/packages/libtool/libtool-2.2.2/prefix.patch b/meta/packages/libtool/libtool-2.2.2/prefix.patch
deleted file mode 100644
index 639feb745..000000000
--- a/meta/packages/libtool/libtool-2.2.2/prefix.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure
-it can't be confused with the host libtool.
-
-Index: libtool-2.2.2/libltdl/m4/libtool.m4
-===================================================================
---- libtool-2.2.2.orig/libltdl/m4/libtool.m4 2008-04-13 22:43:05.000000000 +0100
-+++ libtool-2.2.2/libltdl/m4/libtool.m4 2008-04-13 22:43:05.000000000 +0100
-@@ -89,7 +89,8 @@
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)'
-+LIBTOOL="$LIBTOOL/$host_alias-libtool"
- AC_SUBST(LIBTOOL)dnl
-
- _LT_SETUP
-@@ -211,7 +212,7 @@
- no_glob_subst='s/\*/\\\*/g'
-
- # Global variables:
--ofile=libtool
-+ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
-Index: libtool-2.2.2/Makefile.am
-===================================================================
---- libtool-2.2.2.orig/Makefile.am 2008-04-01 19:06:08.000000000 +0100
-+++ libtool-2.2.2/Makefile.am 2008-04-13 22:49:17.000000000 +0100
-@@ -31,7 +31,7 @@
- DIST_SUBDIRS = .
- EXTRA_DIST =
-
--BUILT_SOURCES = libtool
-+BUILT_SOURCES = $(host_alias)-libtool
-
- CLEANFILES =
- MOSTLYCLEANFILES =
-@@ -64,7 +64,7 @@
- ## ---------------- ##
-
- # The libtool distributor and the standalone libtool script.
--bin_SCRIPTS = libtoolize libtool
-+bin_SCRIPTS = libtoolize $(host_alias)-libtool
-
- libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
- rm -f libtoolize.tmp libtoolize
-@@ -90,8 +90,8 @@
- # We used to do this with a 'stamp-vcl' file, but non-gmake builds
- # would rerun configure on every invocation, so now we manually
- # check the version numbers from the build rule when necessary.
--libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog
-- @target=libtool; $(rebuild); \
-+$(host_alias)-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog
-+ @target=$(host_alias)-libtool; $(rebuild); \
- if test -f "$$target"; then \
- set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
- test "$$actualver" = "$$correctver" && rebuild=false; \
-@@ -100,8 +100,8 @@
- case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
- done; \
- if $$rebuild; then \
-- echo $(SHELL) ./config.status $$target; \
-- cd $(top_builddir) && $(SHELL) ./config.status $$target; \
-+ echo $(SHELL) ./config.status libtool; \
-+ cd $(top_builddir) && $(SHELL) ./config.status libtool; \
- fi
-
- .PHONY: configure-subdirs
-@@ -145,7 +145,7 @@
- ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \
- ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
- ChangeLog.2005 ChangeLog.2006 ChangeLog.2007
--CLEANFILES += libtool libtoolize libtoolize.tmp \
-+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
- $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
-
- ## We build ltversion.m4 here, instead of from config.status,
-@@ -483,12 +483,12 @@
-
- BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
- LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
-- LIBTOOL="$(abs_top_builddir)/libtool" \
-+ LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \
- tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4"
-
- INSTALLCHECK_ENVIRONMENT = \
- LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \
-- LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \
-+ LIBTOOL="$(bindir)/`echo $(host_alias)-libtool | sed '$(program_transform_name)'`" \
- LTDLINCL="-I$(includedir)" \
- LIBLTDL="$(libdir)/libltdl.la" \
- tst_aclocaldir="$(aclocaldir)"
-@@ -620,7 +620,7 @@
- TESTS += $(FC_TESTS)
- endif
-
--tests/demo-conf.test: libtool
-+tests/demo-conf.test: $(host_alias)-libtool
-
- EXTRA_DIST += $(srcdir)/tests/defs.in tests/defs.m4sh \
- $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) $(FC_TESTS)