-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 d32b422eba97956ff1c4b2d270460b9a ChangeLog 15690
+MD5 f06748ce5113a12e8025baa01d2cd752 ChangeLog 15950
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 7f097b89e5b555f46b8c56b064f21db8 files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073
MD5 c7faa473d0ebb7cddcae5fb6e76ed29d files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637
MD5 ed908a69f44e42aa9dce9ffde8bbb41d files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185
+MD5 7ee59c3c6384fd26a9e93db41bc1c88b files/1.5.20/libtool-1.5.20-version-checking.patch 1864
MD5 eea7fbac7b23154feebdfb9ad0951569 files/1.5.6/libtool-1.5-filter-host-tags.patch 1426
MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18-r1 67
MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20 67
+MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20-r1 67
MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
+MD5 86dd9bc18548613d5629e361b17fb257 libtool-1.5.20-r1.ebuild 5117
MD5 200271efe4b1303894b7b3c617a4ddef libtool-1.5.20.ebuild 5104
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDY0Q3gIKl8Uu19MoRAmhVAJ9GOR2gK/AoNzF3L7eIVKpaCUDxCgCfUkBa
-sTse/GtvYC6wieibnKIlnI0=
-=2E0a
+iD8DBQFDasihgIKl8Uu19MoRAnv4AJ9JLS0mvuftoop3V9ifC9MsSQTPcwCdErGE
+0aEO9SOmRMLCO6duCpQA7I4=
+=/aQA
-----END PGP SIGNATURE-----
--- /dev/null
+Add a sanity check to make sure the libtool code in the 'configure' script is
+in sync with the local 'ltmain.sh'. If they are out of sync, libtool may
+generate the libraries incorrectly.
+
+http://bugs.gentoo.org/73140
+
+--- libtool-1.5.20/libtool.m4
++++ libtool-1.5.20/libtool.m4
+@@ -212,6 +212,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
+@@ -219,6 +227,41 @@
+ ])# AC_LIBTOOL_SETUP
+
+
++# _LT_VERSION_CHECK
++# -----------------
++AC_DEFUN([_LT_VERSION_CHECK],
++[AC_MSG_CHECKING([for correct ltmain.sh version])
++if test "x$ltmain" = "x" ; then
++ AC_MSG_RESULT(no)
++ AC_MSG_ERROR([
++
++*** @<:@Gentoo@:>@ sanity check failed! ***
++*** \$ltmain is not defined, please check the patch for consistency! ***
++])
++fi
++gentoo_lt_version="@_LT_VERSION@"
++gentoo_ltmain_version=`grep '^@<:@ @:>@*VERSION=' $ltmain | sed -e 's|^@<:@ @:>@*VERSION=||'`
++if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
++ AC_MSG_RESULT(no)
++ AC_MSG_ERROR([
++
++*** @<:@Gentoo@:>@ sanity check failed! ***
++*** libtool.m4 and ltmain.sh have a version mismatch! ***
++*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
++
++Please run:
++
++ libtoolize --copy --force
++
++if appropriate, please contact the maintainer of this
++package (or your distribution) for help.
++])
++else
++ AC_MSG_RESULT(yes)
++fi
++])# _LT_VERSION_CHECK
++
++
+ # _LT_AC_SYS_COMPILER
+ # -------------------
+ AC_DEFUN([_LT_AC_SYS_COMPILER],
--- /dev/null
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.20-r1.ebuild,v 1.1 2005/11/04 02:33:25 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+
+inherit eutils
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="sys-devel/gnuconfig
+ >=sys-devel/autoconf-2.59
+ >=sys-devel/automake-1.9"
+DEPEND="${RDEPEND}
+ sys-apps/help2man"
+
+lt_setup() {
+ export WANT_AUTOCONF=2.5
+ export WANT_AUTOMAKE=1.9
+}
+
+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 "${S}"
+
+ # Make sure non of the patches touch ltmain.sh, but rather ltmain.in
+ rm -f ltmain.sh*
+
+ # 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 update 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
+ # Mandrake patches
+ epatch "${FILESDIR}"/1.4.3/${PN}-1.4.3-lib64.patch
+# Fix bug #43244
+# 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.5.6/${PN}-1.5.6-ltmain-SED.patch
+ epatch "${FILESDIR}"/1.4.3/${PN}-1.4.2-expsym-linux.patch
+ epatch "${FILESDIR}"/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
+ epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
+
+ # 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.5.10/${PN}-1.5.10-portage.patch
+ # If a package use an older libtool, and libtool.m4 for that
+ # 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.20/${PN}-1.5.20-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
+ # possible misbehaviour.
+ # <azarah@gentoo.org> - (11 Feb 2004)
+ epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-ltmain_sh-max_cmd_len.patch
+
+ # Libtool's autoguessing at tag's sucks ... it get's confused
+ # if the tag's CC says '<CHOST>-gcc' and the env CC says 'gcc'
+ # or vice versa ... newer automakes specify the tag so no
+ # guessing is needed #67692
+ epatch "${FILESDIR}"/1.5.6/libtool-1.5-filter-host-tags.patch
+
+ # Libtool uses links to handle locking object files with
+ # dependencies. Hard links can't cross filesystems though,
+ # so we have to use a diff source for the link. #40992
+ epatch "${FILESDIR}"/1.5.10/libtool-1.5.10-locking.patch
+
+ # In some cases EGREP is not set by the build system.
+ epatch "${FILESDIR}"/1.5.14/libtool-1.5.14-egrep.patch
+
+ # Make sure LD_LIBRARY_PATH doesn't override RUNPATH #99593
+ epatch "${FILESDIR}"/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
+
+ ebegin "Generating ltmain.sh"
+ gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+ eend 0
+
+ # Now let's run all our autotool stuff so that files we patch
+ # below don't get regenerated on us later
+ cp libtool.m4 acinclude.m4
+ local d p
+ for d in . libltdl ; do
+ ebegin "Running autotools in '${d}'"
+ cd "${S}"/${d}
+ touch acinclude.m4
+ for p in aclocal "automake -c -a" autoconf ; do
+ ${p} || die "${p}"
+ done
+ eend 0
+ done
+ cd "${S}"
+
+ epunt_cxx
+}
+
+src_compile() {
+ lt_setup
+ econf || die
+ emake || die
+}
+
+src_install() {
+ make 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
+ done
+
+ for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+ rm -f "${x}" ; ln -sf ../gnuconfig/$(basename "${x}") "${x}"
+ done
+ cd "${D}"/usr/share/libtool/libltdl
+ for x in config.guess config.sub ; do
+ rm -f ${x} ; ln -sfn ../${x} ${x}
+ done
+}
projects / gentoo.git / commitdiff