If a package use an older libtool, and libtool.m4 for that package is

updated, but not libtool, then we run into an issue where
is not set.  This results in libraries being built without '.so'
extension, bug #40901.

5 files changed, 242 insertions, 2 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 50ac43ac8483..1a13849dbcda 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.33 2004/02/07 21:36:26 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.34 2004/02/11 17:48:05 azarah Exp $
+
+*libtool-1.5.2-r2 (11 Feb 2004)
+
+  11 Feb 2004; Martin Schlemmer <azarah@gentoo.org> libtool-1.5.2-r2.ebuild,
+  files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch:
+  If a package use an older libtool, and libtool.m4 for that package is
+  updated, but not libtool, then we run into an issue where $shared_ext
+  is not set.  This results in libraries being built without '.so'
+  extension, bug #40901.
 
 *libtool-1.5.2-r1 (07 Feb 2004)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 7ad38dfc17bc..9d87912ebd2b 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,15 +1,18 @@
-MD5 4b551ec54163085b9709342fad272b6f ChangeLog 5835
+MD5 6d689c9ae203d532c261cab1d31419d8 ChangeLog 6239
 MD5 fbcf7a29349882a6f6c75491400d1953 libtool-1.4.1-r10.ebuild 1780
 MD5 4d48b4072e8f2a4591a4d80a23f6042f libtool-1.4.2-r2.ebuild 2182
+MD5 6e9311e710399a611970be41fcff8b23 libtool-1.5.2-r2.ebuild 5117
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3a0095e2cf87981d079b9ca02c2556ee libtool-1.4.3-r3.ebuild 4786
 MD5 867e676a7b9923c1f1a585700a6e0185 libtool-1.5.2-r1.ebuild 4750
 MD5 0988730d91b787159d631c37932efef5 files/digest-libtool-1.4.2-r2 66
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r1 131
 MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
+MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r2 131
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r3 131
 MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
 MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
+MD5 8ccfbb70def73753ae1b2750c6e4e83c files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 880
 MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
 MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
 MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
diff --git a/sys-devel/libtool/files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch b/sys-devel/libtool/files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch
new file mode 100644
index 000000000000..3be3a61cdc81
--- /dev/null
+++ b/sys-devel/libtool/files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch
@@ -0,0 +1,35 @@
+--- libtool-1.5.2/libtool.m4	2004-02-10 00:23:58.000000000 +0200
++++ libtool-1.5.2.shared_ext/libtool.m4	2004-02-10 23:32:08.364266152 +0200
+@@ -229,6 +229,7 @@
+ tagname=
+ AC_LIBTOOL_LANG_C_CONFIG
+ _LT_AC_TAGCONFIG
++_LT_AC_SHARED_EXT
+ ])# AC_LIBTOOL_SETUP
+ 
+ 
+@@ -1788,6 +1789,24 @@
+ fi
+ ])# _LT_AC_TAGCONFIG
+ 
++# _LT_AC_SHARED_EXT
++# ----------------
++AC_DEFUN([_LT_AC_SHARED_EXT],[
++  if test ! -f "${ofile}"; then
++    AC_MSG_WARN([output file `$ofile' does not exist])
++  fi
++  if test -z `grep -e 'shared_ext.*shrext' $ofile`; then
++    # Make sure $shared_ext gets set to $shrext
++    if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then
++      mv "${ofile}T" "$ofile"
++      chmod +x "$ofile"
++    else
++      rm -f "${ofile}T"
++      AC_MSG_ERROR([unable to update shared_ext.])
++    fi
++  fi
++])# _LT_AC_SHARED_EXT
++
+ 
+ # AC_LIBTOOL_DLOPEN
+ # -----------------
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.2-r2 b/sys-devel/libtool/files/digest-libtool-1.5.2-r2
new file mode 100644
index 000000000000..301451dc934e
--- /dev/null
+++ b/sys-devel/libtool/files/digest-libtool-1.5.2-r2
@@ -0,0 +1,2 @@
+MD5 db66ba05502f533ad0cfd84dc0e03bd5 libtool-1.5.2.tar.gz 2653072
+MD5 fa26a07c978ad05d1f88ed7a472daa49 libtool-1.3.5.tar.gz 538884
diff --git a/sys-devel/libtool/libtool-1.5.2-r2.ebuild b/sys-devel/libtool/libtool-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..14fb10cd0d41
--- /dev/null
+++ b/sys-devel/libtool/libtool-1.5.2-r2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r2.ebuild,v 1.1 2004/02/11 17:48:05 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
+
+IUSE=
+
+inherit eutils gnuconfig
+
+# NOTE:  We install libltdl of libtool-1.3x for compat reasons ...
+
+OLD_PV="1.3.5"
+S="${WORKDIR}/${P}"
+OLD_S="${WORKDIR}/${PN}-${OLD_PV}"
+DESCRIPTION="A shared library tool for developers"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gnu/${PN}/${PN}-${OLD_PV}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64 ppc64"
+
+DEPEND="virtual/glibc"
+
+
+lt_setup() {
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_5=1
+}
+
+gen_ltmain_sh() {
+	local date=
+	local PACKAGE=
+	local VERSION=
+
+	rm -f ltmain.shT
+	date=`./mkstamp < ./ChangeLog` && \
+	eval `egrep '^[[:space:]]*PACKAGE' configure` && \
+	eval `egrep '^[[:space:]]*VERSION' configure` && \
+	sed -e "s/@PACKAGE@/${PACKAGE}/" -e "s/@VERSION@/${VERSION}/" \
+		-e "s%@TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT || return 1
+
+	mv -f ltmain.shT ltmain.sh || {
+		(rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
+		return 1
+	}
+
+	return 0
+}
+
+src_unpack() {
+	lt_setup
+
+	unpack ${A}
+
+	cd ${OLD_S}
+	echo
+	# Install updated missing script
+	portageq has_version / "sys-devel/automake" && {
+		rm -f missing
+		automake --add-missing
+	}
+
+	einfo "Patching ${OLD_S##*/} ..."
+	epatch ${FILESDIR}/1.4.3/${PN}-1.2f-cache.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-nonneg.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
+
+	use hppa && S="${OLD_S}" gnuconfig_update
+	use amd64 && S="${OLD_S}" gnuconfig_update
+
+	cd ${S}
+	echo
+	# Install updated missing script
+#	portageq has_version / "sys-devel/automake" && {
+#		rm -f missing
+#		automake --add-missing
+#	}
+
+	# Make sure non of the patches touch ltmain.sh, but rather ltmain.in
+	rm -f ltmain.sh*
+
+	einfo "Patching ${S##*/} ..."
+	# Redhat patches
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4-nonneg.patch
+	# Fix the relink problem where the relinked libs do not get
+	# installed.  It is *VERY* important that you get a updated
+	# 'libtool-1.4.3-relink.patch' if you update this, as it
+	# fixes a very serious bug.  Please not that this patch is
+	# included in 'libtool-1.4.3-gentoo.patch' for this ebuild.
+	#
+	# NOTE: all affected apps should get a 'libtoolize --copy --force'
+	#      added to upate libtool
+	#
+# Seems to be included in shipped tarball ...
+#	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-relink-58664.patch
+
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-multilib.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-demo.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.5-libtool.m4-x86_64.patch
+	epatch ${FILESDIR}/${PV}/${PN}-1.5-testfailure.patch
+	# Mandrake patches
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-lib64.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-archive-shared.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-ltmain-SED.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-expsym-linux.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-amd64-alias.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-libtoolize--config-only.patch
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
+
+	# Gentoo Patches
+	# Do not create bogus entries in $dependency_libs or $libdir
+	# with ${D} or ${S} in them.
+	# azarah@gentoo.org (07 April 2002)
+	epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-portage.patch
+	# If a package use an older libtool, and libtool.m4 for that
+	# package is updated, but not libtool, then we run into an
+	# issue where $shared_ext is not set.  This results in libraries
+	# being built without '.so' extension, bug #40901
+	# azarah@gentoo.org (11 Feb 2004)
+	epatch ${FILESDIR}/${PV}/${PN}-1.5.2-libtool_m4-shared_ext.patch
+
+	einfo "Generate ltmain.sh ..."
+	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+}
+
+src_compile() {
+	lt_setup
+
+	#
+	# ************ libtool-1.3x ************
+	#
+
+	cd ${OLD_S}
+
+	# Detect mips/mips64
+	use mips && gnuconfig_update
+
+	einfo "Configuring ${OLD_S##*/} ..."
+	./configure --host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info || die
+
+	einfo "Building ${OLD_S##*/} ..."
+	emake || die
+
+	#
+	# ************ libtool-1.5x ************
+	#
+
+	cd ${S}
+
+	# Detect mips/mips64
+	use mips && gnuconfig_update
+
+	einfo "Configuring ${S##*/} ..."
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info || die
+
+	einfo "Building ${S##*/} ..."
+	emake || die
+}
+
+src_install() {
+	#
+	# ************ libtool-1.3x ************
+	#
+
+	einfo "Installing ${OLD_S##*/} ..."
+	cd ${OLD_S}/libltdl; make DESTDIR=${D} install || die
+
+	# Remove stuff we are not going to use ...
+	for x in libltdl.a  libltdl.la  libltdl.so
+	do
+		[ -f ${x} ] && rm -f ${D}/usr/lib/${x}
+	done
+	rm -rf ${D}/usr/include
+
+	#
+	# ************ libtool-1.5x ************
+	#
+
+	einfo "Installing ${S##*/} ..."
+	cd ${S}; make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog* NEWS \
+	      README THANKS TODO doc/PLATFORMS
+}
+