# HG changeset patch # User Nathan Phillip Brink # Date 2010-02-25 21:29:35 # Node ID 9c72f8d8b1adfdc76409c896efb84d1876c6eb0a # Parent d406cc68b09691d35d010ef54e4acc90ce05e1c0 sys-devel/libtool: Simple patch against ltdl.m4 for bug 293921 . Removed old versions of libtool. diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog --- a/sys-devel/libtool/ChangeLog +++ b/sys-devel/libtool/ChangeLog @@ -1,7 +1,17 @@ # ChangeLog for sys-devel/libtool -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.165 2009/12/09 17:45:58 armin76 Exp $ + 26 Feb 2010; Nathan Phillip Brink (ohnobinki) + -libtool-1.3.5.ebuild, + -files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch, + -libtool-1.5.26.ebuild, -libtool-1.5.26-r1.ebuild, + -files/1.5.6/libtool-1.5-filter-host-tags.patch, -libtool-2.2.6b.ebuild, + +libtool-2.2.6b-r1.ebuild, + +files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch, libtool-9999.ebuild: + Simple patch against ltdl.m4 for bug 293921 . Removed old versions of + libtool. + 09 Dec 2009; Raúl Porcel libtool-2.2.6b.ebuild: alpha/ia64/m68k/s390/sh stable wrt #295535 diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest --- a/sys-devel/libtool/Manifest +++ b/sys-devel/libtool/Manifest @@ -1,27 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX 1.5.10/libtool-1.5.10-locking.patch 629 RMD160 922b2d8cba8e869afc9a1cde9ec0065e1ccaadcf SHA1 6d6b77b42b4729b48c7bf0ad6f8a4b962bc97298 SHA256 14b54a1c2c01e7e0f2399b253a5e9603c5f8f59ac655489bd74ee9e8cf8a3774 -AUX 1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637 RMD160 f46d46cdd9e568b020eddeae48e9f84a763fee2f SHA1 924d9a8b23d3d138287bef4596a93bb2608849a1 SHA256 08422e5d6dd2f01b4bd2f065c910724772cbe6ad2632be2cf8279e4b50b61a47 AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5fd1ea9ffd403f5641f620791d833db SHA1 8d5784695682e3e8a271a9ed635d9d1566c4e99b SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326 AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 RMD160 25b981402a038a2c4c5ad64066c5f8a5b1416b36 SHA1 c5000fa6da0ffec1d7c48d871db94d8237c949ca SHA256 0d1af5e7024949dcf95bef0d5a47387d0b04b7905d0a55d3349576733783bb6d -AUX 1.5.6/libtool-1.5-filter-host-tags.patch 1608 RMD160 af10d3d3459d07f77ccbdef6080e931e3387af38 SHA1 5d27c058f803cdc1953e82b71f747c2028b78ea0 SHA256 a50cba1c4b799717b21355cc908993c5cdf913b66881992b74b79001f8feb891 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-1.3.5.tar.gz 538884 RMD160 0bb20b6802bc790dcbdaecde4058ed06ec77b429 SHA1 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f -DIST libtool-1.5.26.tar.gz 2961939 RMD160 4d1d7dd0308b98e8f590723ae5daddb8da49ac11 SHA1 4c1738351736562a951a345e24f233d00953ec0a SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09 +AUX 2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch 924 RMD160 1bd74d2fa0326af7f2ecb318dcb2057b87d44496 SHA1 b1b64b9621fef7d68d2e492e37c4c2f9a721a635 SHA256 b844582777579ee89cf874c462c103eaac6601238d3bc17b354e2290d4ccd2cf DIST libtool-2.2.6b.tar.lzma 739089 RMD160 cb209df9819510928c17d36ce8b461bd8418a6a1 SHA1 18baaac89eed8be7bd2af2d2181598e176029cc6 SHA256 66ebad3c02e5cb6672bfbda1183fb6fc919d33d676eb8be4b7834aa7c3b8b7ae -EBUILD libtool-1.3.5.ebuild 800 RMD160 6c4fea1ab669d1a1926f176476fcba1f1fc84483 SHA1 a0fafa46ce16604a62bd56efdc65196730bb9397 SHA256 1d937d795219f49d8231ec0e11963043e4586da182603425f5b475d24600f49f -EBUILD libtool-1.5.26-r1.ebuild 756 RMD160 dbde9e0664ef807199f86e44bf675afcebe8aa6e SHA1 f36b4e5c2994150f35899e708e405325910494eb SHA256 23ccee0df4d6cbf584b29c70c4c4c7a4a40d02798758977c68503c90ef265cb5 -EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d -EBUILD libtool-2.2.6b.ebuild 2287 RMD160 5417197a72ffeed053537e1e1ad99561a4c63062 SHA1 e538863b0c5e32f15e49bc9d2890bb57d0d10630 SHA256 fcdd2c5c7bec1bdf9e84a583fb277716d7a2d94b1fa46a37ee38574dc9eb9dd9 -EBUILD libtool-9999.ebuild 1327 RMD160 f9a217315d38dfda00e8d8c6877040dac63dbb66 SHA1 38aeec4338c6d1e58c69ec6ab639f8ee55f34f7f SHA256 b7c9be504e756544411db0d163237834e146de5e9c7e8302b0a1d8b89d124f02 -MISC ChangeLog 24697 RMD160 a676039bc558effae7597b1d0b70dfdef7d2801a SHA1 03cca197fbf287bb68066e71576ee017878939f1 SHA256 65fcf13ad8b0df903b8486e920f9e98c5e2f761d4c883f19efb8fef600f2af03 +EBUILD libtool-2.2.6b-r1.ebuild 2361 RMD160 a9a6211aac6e3a4150d626cbc6938307c0bc536f SHA1 cabc2995361525b3e8b0f297f0fae1df52b18029 SHA256 841fc2037da809d185ebf394fecd9da1a296439626b04ac2d670b394c1ffa152 +EBUILD libtool-9999.ebuild 1388 RMD160 25043fd7679e65da1830499375b7e2a5eb674b49 SHA1 a045013c26ea690ad133d1c11da87017cc2fad44 SHA256 8d6a466ddb60ee9f309a689d4ec2bd0dfd87c6cbc911fa53c10b7bd9980a0601 +MISC ChangeLog 25178 RMD160 7518fdcdf2d5a45a2e217aafe8d1d8ef2a1783c7 SHA1 f650ef24a07b8b8758ba35ec25447d752d3eae95 SHA256 d0b9164297f47582a88ff5df492cfb44d513a09b64939026b6a8bba8583e75c6 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iF4EAREIAAYFAkt4KqIACgkQTwhj9JtAlp4b+gD9FPAYq2s04TBff8IirereKaKD -ff8giZ4q8hBf9xsRcCEA/RcZN5G4AZEMVRl+X26TI9yrSvoyT47Vk10/o0AIRu7g -=Xsm7 ------END PGP SIGNATURE----- diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch deleted file mode 100644 --- a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix build time issues with tools who like to export LD_LIBRARY_PATH -to retarded values. - -http://bugs.gentoo.org/99593 -http://lists.gnu.org/archive/html/libtool/2005-09/msg00053.html - ---- monkey/ltmain.in -+++ butt/ltmain.in -@@ -5085,6 +5085,11 @@ - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -+ -+ # Make sure env LD_LIBRARY_PATH does not mess us up -+ if test -n \"\${LD_LIBRARY_PATH+set}\"; then -+ export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH -+ fi - " - case $host in - # Backslashes separate directories on plain windows diff --git a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch deleted file mode 100644 --- a/sys-devel/libtool/files/1.5.6/libtool-1.5-filter-host-tags.patch +++ /dev/null @@ -1,34 +0,0 @@ -Libtool's autoguessing at tag's sucks ... it get's confused -if the tag's CC says '-gcc' and the env CC says 'gcc' -or vice versa ... newer automakes specify the tag so no -guessing is needed - -Make the infer tag logic a bit more magical since a lot of old packages still -exist which utilize this functionality. - -http://bugs.gentoo.org/77921 - ---- libtool-1.5.10/ltmain.in -+++ libtool-1.5.10/ltmain.in -@@ -242,7 +242,21 @@ - esac - CC_quoted="$CC_quoted $arg" - done -+ # user sometimes does CC=-gcc so we need to match that to 'gcc' -+ trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"` -+ # and sometimes libtool has CC=-gcc but user does CC=gcc -+ extendcc=${host}-${CC} -+ # and sometimes libtool has CC=-gcc but user has CC=-gcc -+ # (Gentoo-specific hack because we always export $CHOST) -+ mungedcc=${CHOST-${host}}-${trimedcc} - case "$@ " in -+ "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\ -+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) -+ tagname=CC -+ break ;; -+ "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\ -+ "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\ -+ "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\ - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. diff --git a/sys-devel/libtool/files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch b/sys-devel/libtool/files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch new file mode 100644 --- /dev/null +++ b/sys-devel/libtool/files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/293921 + +ohnobinki's attempt at convincing ltdl.m4 to permit people +to delete that special type of libtool archive which has +no use on a modern GNU/Linux system. + +diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4 +index 111fac1..4bedc34 100644 +--- a/libltdl/m4/ltdl.m4 ++++ b/libltdl/m4/ltdl.m4 +@@ -282,8 +282,11 @@ AC_ARG_WITH([ltdl_lib], + [use the libltdl.la installed in DIR])]) + + if test -n "$with_ltdl_lib"; then +- if test -f "$with_ltdl_lib/libltdl.la"; then : +- else ++ # check for the existence of "$with_ltdl_lib/libltdl.la" while ++ # allowing people to libtool archive file (which isn't useful ++ # in this case in many common platforms.) ++ with_ltdl_lib_libname=$(echo "$with_ltdl_lib"/libltdl.*) 2>/dev/null ++ if test "x$with_ltdl_lib_libname" = "x$with_ltdl_lib/libltdl.*"; then + AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib']) + fi + else diff --git a/sys-devel/libtool/libtool-1.3.5.ebuild b/sys-devel/libtool/libtool-1.3.5.ebuild deleted file mode 100644 --- a/sys-devel/libtool/libtool-1.3.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.3.5.ebuild,v 1.8 2008/04/22 23:02:32 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $ - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="http://www.gnu.org/software/libtool/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="1.3" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -src_compile() { - econf \ - --enable-ltdl-install \ - --disable-static \ - || die - emake -C libltdl || die -} - -src_install() { - emake -C libltdl DESTDIR="${D}" install-exec || die - # basically we just install ABI libs for old packages - rm "${D}"/usr/*/libltdl.{la,so} || die -} diff --git a/sys-devel/libtool/libtool-1.5.26-r1.ebuild b/sys-devel/libtool/libtool-1.5.26-r1.ebuild deleted file mode 100644 --- a/sys-devel/libtool/libtool-1.5.26-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# 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-1.5.26-r1.ebuild,v 1.1 2009/09/28 22:30:49 vapier Exp $ - -EAPI="2" - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="http://www.gnu.org/software/libtool/" -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 ~sparc-fbsd ~x86-fbsd" -IUSE="" - -S=${WORKDIR}/${P}/libltdl - -src_configure() { - econf --disable-static || die -} - -src_install() { - emake DESTDIR="${D}" install-exec || die - # basically we just install ABI libs for old packages - rm "${D}"/usr/*/libltdl.{la,so} || die -} diff --git a/sys-devel/libtool/libtool-1.5.26.ebuild b/sys-devel/libtool/libtool-1.5.26.ebuild deleted file mode 100644 --- a/sys-devel/libtool/libtool-1.5.26.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.26.ebuild,v 1.9 2008/03/14 11:22:20 vapier Exp $ - -inherit eutils - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="http://www.gnu.org/software/libtool/" -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 ~sparc-fbsd x86 ~x86-fbsd" -IUSE="vanilla" - -RDEPEND="sys-devel/gnuconfig - >=sys-devel/autoconf-2.60 - >=sys-devel/automake-1.10" -DEPEND="${RDEPEND} - sys-apps/help2man" - -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() { - unpack ${A} - cd "${S}" - - use vanilla && return 0 - - # Make sure non of the patches touch ltmain.sh, but rather ltmain.in - rm -f ltmain.sh* - - epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105 - epatch "${FILESDIR}"/1.5.10/libtool-1.5.10-locking.patch #40992 - - # Note: The following patches should be dropped with libtool-2+ - epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-version-checking.patch #73140 - sed -i "s:@_LT_VERSION@:${PV}:" libtool.m4 || die "sed libtool.m4" - epatch "${FILESDIR}"/1.5.6/libtool-1.5-filter-host-tags.patch - 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 - einfo "Ignore any warnings below about QA/autotools" - 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_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 ../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 -} diff --git a/sys-devel/libtool/libtool-2.2.6b.ebuild b/sys-devel/libtool/libtool-2.2.6b-r1.ebuild rename from sys-devel/libtool/libtool-2.2.6b.ebuild rename to sys-devel/libtool/libtool-2.2.6b-r1.ebuild --- a/sys-devel/libtool/libtool-2.2.6b.ebuild +++ b/sys-devel/libtool/libtool-2.2.6b-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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 $ @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lzm LICENSE="GPL-2" SLOT="1.5" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +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 @@ -38,6 +38,7 @@ src_unpack() { if ! use vanilla ; then epunt_cxx + epatch "${FILESDIR}"/${PV}/${P}-ltdl.m4-no-la.patch #293921 cd libltdl/m4 epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105 cd .. diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild --- a/sys-devel/libtool/libtool-9999.ebuild +++ b/sys-devel/libtool/libtool-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.4 2009/09/13 14:46:53 flameeyes Exp $ @@ -40,6 +40,7 @@ src_unpack() { use vanilla && return 0 epunt_cxx + epatch "${FILESDIR}"/${PV}/${P}-ltdl.m4-no-la.patch #293921 cd libltdl/m4 epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105 }