# ChangeLog for sys-devel/libtool
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.60 2004/11/30 04:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.61 2004/12/11 22:46:01 vapier Exp $
+
+*libtool-1.5.10-r1 (11 Dec 2004)
+
+ 11 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+ +files/1.5.10/libtool-1.5.10-version-checking.patch,
+ -files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch,
+ +libtool-1.5.10-r1.ebuild:
+ Rather than guess at variable name changes, perform version sanity checks to
+ make sure that the libtool version being used by configure (via
+ aclocal.m4/libtool.m4) matches that of the local ltmain.sh/libtool files.
29 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+files/1.5.10/libtool-1.5.10-locking.patch, libtool-1.5.10.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 bfe464e19b82292495364ca4c9ffa862 ChangeLog 10528
-MD5 80ab32a03835f6f7da64c2153a8084aa libtool-1.5.10.ebuild 4838
+MD5 74b898baf71154f91ae696f4a58166fe ChangeLog 10976
MD5 c7d132d71d78498f24bd4cec9d83b045 libtool-1.5.2-r5.ebuild 5895
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
MD5 e2d0fc200b734149d8ab0aa017c39b32 libtool-1.3.5.ebuild 1495
MD5 4e0ca94ccc4a3248e4bf6474b9a90080 libtool-1.5.2-r7.ebuild 6172
+MD5 6a647cd5af0e8b44f5a521db98fbf45f libtool-1.5.10-r1.ebuild 4898
MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
-MD5 bb976ab258ba1974bf1a3cd0a51ce34b files/digest-libtool-1.5.10 67
MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r7 131
+MD5 bb976ab258ba1974bf1a3cd0a51ce34b files/digest-libtool-1.5.10-r1 67
MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r5 131
MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
MD5 2196d46d17a239f4b4d7629ca264a9ff files/1.5.10/libtool-1.5.10-locking.patch 513
+MD5 c420dec3cd806113ecc347a457137ea6 files/1.5.10/libtool-1.5.10-version-checking.patch 1805
MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
MD5 5fc838faf61964397b525e579783c190 files/1.4.3/libtool-1.4.3-uclibc.patch 5911
MD5 73a7adc6c9b86c77affeeebccad0eedf files/1.4.3/libtool-1.4.2-portage.patch 2307
-MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
MD5 e9bbbf33e0ca9ed566c2bf5209265cfe files/1.5.6/libtool-1.5-filter-host-tags.patch 785
-MD5 d5d5e0c05015661718dd3015531342c5 files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch 897
+MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
+MD5 ec9cd0c9953bac111564122a5c209278 files/1.5.2/libtool-1.5-filter-host-tags.patch 1846
MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
MD5 8ac4aa8ff1c680fe44447274d9f3a673 files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 882
MD5 b81a86ce5e9014e53bd7beb12e46ed12 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1155
-MD5 ec9cd0c9953bac111564122a5c209278 files/1.5.2/libtool-1.5-filter-host-tags.patch 1846
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.9.10 (GNU/Linux)
-iD8DBQFBq/EWroRuSHgZdywRArAiAJ9tbosGviQMw4yUeKslWGs5Dcv4zACfW/M/
-80uq79eg8R/UnDO4dXvq8a4=
-=YLiU
+iD8DBQFBu3jJroRuSHgZdywRAhzUAJ93zTcsWgEY2DbPrmPyoR7j2Wgl+QCdHv88
+YZIsXJZNtQyjRPpilQAd4Ug=
+=eVCo
-----END PGP SIGNATURE-----
--- /dev/null
+--- libtool-1.5.10/libtool.m4.orig 2004-12-11 13:28:30.494718288 -0500
++++ libtool-1.5.10/libtool.m4 2004-12-11 13:31:51.452168112 -0500
+@@ -227,6 +227,14 @@
+ [pic_mode=default])
+ test -z "$pic_mode" && pic_mode=default
+
++# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
++#
++# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
++# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
++# calls AC_LIBTOOL_CONFIG and creates libtool.
++#
++_LT_VERSION_CHECK
++
+ # Use C for the default configuration in the libtool script
+ tagname=
+ AC_LIBTOOL_LANG_C_CONFIG
+@@ -234,6 +242,41 @@
+ ])# AC_LIBTOOL_SETUP
+
+
++# _LT_VERSION_CHECK
++# -----------------
++AC_DEFUN([_LT_VERSION_CHECK],
++[AC_MSG_CHECKING([for correct ltmain.sh version])
++if test -z "$ltmain"; then
++ AC_MSG_RESULT(no)
++ echo
++ echo "*** [Gentoo] sanity check failed! ***"
++ echo "*** \$ltmain is not defined, please check the patch for consistency! ***"
++ echo
++ exit 1
++fi
++gentoo_lt_version="@_LT_VERSION@"
++gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
++if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
++ AC_MSG_RESULT(no)
++ echo
++ echo "*** [Gentoo] sanity check failed! ***"
++ echo "*** libtool.m4 and ltmain.sh have a version mismatch! ***"
++ echo "*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***"
++ echo
++ echo "Please run:"
++ echo
++ echo " libtoolize --copy --force"
++ echo
++ echo "if appropriate, please contact the maintainer of this"
++ echo "package (or your distribution) for help."
++ echo
++ exit 1
++else
++ AC_MSG_RESULT(yes)
++fi
++])# _LT_VERSION_CHECK
++
++
+ # _LT_AC_SYS_COMPILER
+ # -------------------
+ AC_DEFUN([_LT_AC_SYS_COMPILER],
+++ /dev/null
---- 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_cmds' $ofile`"; then
-+ # Make sure $shared_ext gets set to $shrext_cmds
-+ if sed -e 's/shared_ext/shrext_cmds/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
- # -----------------
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.10.ebuild,v 1.5 2004/11/30 04:01:32 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.10-r1.ebuild,v 1.1 2004/12/11 22:46:01 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
inherit eutils gnuconfig libtool
# <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}/1.5.6/${PN}-1.5.6-libtool_m4-shared_ext.patch
+ # package is updated, but not libtool, then we may run into an
+ # issue where internal variables are named differently. Often
+ # this shows up as libs being built without '.so' extension #73140
+ epatch ${FILESDIR}/1.5.10/${PN}-1.5.10-version-checking.patch
+ sed -i "s:@_LT_VERSION@:${PV}:" libtool.m4 || die "sed libtool.m4"
# For older autoconf setups's that do not support libtool.m4,
# $max_cmd_len are never set, causing all tests against it to
# fail, resulting in 'integer expression expected' errors and
uclibctoolize
gnuconfig_update ${WORKDIR}
+ epunt_cxx
}
src_compile() {
projects / gentoo.git / commitdiff