Fixing new stable version of libtool for cross-compilation. You have to update your host too!!!

3 files changed, 97 insertions, 0 deletions

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index faa7746..745d948 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,5 +1,8 @@
 AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5fd1ea9ffd403f5641f620791d833db SHA1 8d5784695682e3e8a271a9ed635d9d1566c4e99b SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326
 AUX 2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch 1094 RMD160 580846fcc5848d6d8c849befafa75da97c3fde11 SHA1 64fc17143719426dcb7fba502acdf88a2d4f2d15 SHA256 cc69848e4c20d511ad58e643b509e3e672323421ff469921dc23860e9cfa6e91
 AUX 2.2.6a/libtool-2.2.6a-gnuinfo.patch 1454 RMD160 1342700e864e985559dd55f9d49a7d81c9d2a5ee SHA1 9c5410b857551ec202159dd570ca8a81f40d507e SHA256 a06eee9bbbbb617c6b8014bb67ba1442b0b0a618079998d1f629a6043c97083a
+AUX 2.2.6a/libtool-2.2.6a-tests-locale.patch 599 RMD160 be9e1d21e56a36c5d4d959135afa5928298a66b0 SHA1 a4ae6a4df7b0d43d4d09d07f4aed5edccddf6e55 SHA256 3832137bfb2e4cbf00467ec78ab7041bb7f0fc95d91cdee25717d19b8436c1a0
 DIST libtool-2.2.6a.tar.lzma 733923 RMD160 1f1d4d8a86615fb455b76d5edcc92fe1a8ebfa2b SHA1 7c5fdce11777261a6c407fe97ac8a1ae5fe99d2b SHA256 1d22960afeab230c9c380365ea8791b194109a5f9d5916a1e29c3d0bdaa9638a
+DIST libtool-2.2.6b.tar.lzma 739089 RMD160 cb209df9819510928c17d36ce8b461bd8418a6a1 SHA1 18baaac89eed8be7bd2af2d2181598e176029cc6 SHA256 66ebad3c02e5cb6672bfbda1183fb6fc919d33d676eb8be4b7834aa7c3b8b7ae
 EBUILD libtool-2.2.6a.ebuild 1701 RMD160 ef1d9fee27d251107ff7b1680d8454741130c4ed SHA1 b704ee3b1f258efb26a77ded8a07868d6ae837d1 SHA256 fb8217d0677a2e7734b3b27abaf7f14fc40f7573132359ed5561f193da9fb03a
+EBUILD libtool-2.2.6b.ebuild 2625 RMD160 badaec45cd370651149b7b57ab4478f0800d7dd8 SHA1 eb4a24878d83f0c540bc882810932467b70082b6 SHA256 bddff53c952be0c541ea917e5c70224c5b8ca8d0a899c96794d4a73a155f61be
diff --git a/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-tests-locale.patch b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-tests-locale.patch
new file mode 100644
index 0000000..15730d9
--- /dev/null
+++ b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-tests-locale.patch
@@ -0,0 +1,12 @@
+Index: libtool-2.2.6/tests/localization.at
+===================================================================
+--- libtool-2.2.6.orig/tests/localization.at
++++ libtool-2.2.6/tests/localization.at
+@@ -47,6 +47,7 @@ mv -f stdout expected-stdout
+ mv -f stderr expected-stderr
+ AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || exit 1],
+ 	 [1], [stdout], [stderr])
++AT_CHECK([grep LC_ALL stdout stderr && exit 77], [1])
+ AT_CHECK([diff expected-stderr stderr])
+ LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
+ AT_CHECK([grep -v "^$LTBASE: compile" stdout | diff expected-stdout -])
diff --git a/sys-devel/libtool/libtool-2.2.6b.ebuild b/sys-devel/libtool/libtool-2.2.6b.ebuild
new file mode 100644
index 0000000..15d1aa2
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.2.6b.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.6b.ebuild,v 1.7 2009/12/09 17:45:58 armin76 Exp $
+
+LIBTOOLIZE="true" #225559
+inherit eutils autotools flag-o-matic multilib
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="vanilla test"
+
+RDEPEND="sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.60
+	>=sys-devel/automake-1.10.1"
+DEPEND="${RDEPEND}
+	|| ( app-arch/xz-utils app-arch/lzma-utils )
+	sys-apps/help2man"
+
+pkg_setup() {
+	if use test && ! has_version '>sys-devel/binutils-2.19.51'; then
+		einfo "Disabling --as-needed, since you got older binutils and you asked"
+		einfo "to run tests. With the stricter (older) --as-needed behaviour"
+		einfo "you'd be seeing a test failure in test #63; this has been fixed"
+		einfo "in the newer version of binutils."
+		append-ldflags $(no-as-needed)
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/2.2.6a/${PN}-2.2.6a-tests-locale.patch #249168
+
+	# In ltmain.sh libtool adds "-L${libdir}" to the compiler options when relinking.
+	# For cross-compilations this kills us because normally ${libdir} points to /usr/lib.
+	# We fix this by simply prefixing this with $ROOT, which points to the correct libs.
+	epatch "${FILESDIR}"/2.2.6a/${PN}-2.2.6a-add-cross-compile-root-to-libdir.patch
+
+	if ! use vanilla ; then
+		epunt_cxx
+		cd libltdl/m4
+		epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
+		cd ..
+		AT_NOELIBTOOLIZE=yes eautoreconf
+		cd ..
+		AT_NOELIBTOOLIZE=yes eautoreconf
+	fi
+
+	# the libtool script uses bash code in it and at configure time, tries
+	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+	# cause problems for people who switch /bin/sh on the fly to other
+	# shells, so just force libtool to use /bin/bash all the time.
+	export CONFIG_SHELL=/bin/bash
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+	local x
+	for x in libtool libtoolize ; do
+		help2man ${x} > ${x}.1
+		doman ${x}.1 || die
+	done
+
+	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+		rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
+	done
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libltdl.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3
+}