diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-05-05 06:37:28 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-05-05 06:37:28 +0000 |
commit | e056bbe3b979630803b6c35f9d9b674e0ac3b56e (patch) | |
tree | fc7beb9ac909fe235e542a09b6209f10af3d4e5c /sys-devel | |
parent | most packages are fixed so unmask libtool-2.2 (diff) | |
download | historical-e056bbe3b979630803b6c35f9d9b674e0ac3b56e.tar.gz historical-e056bbe3b979630803b6c35f9d9b674e0ac3b56e.tar.bz2 historical-e056bbe3b979630803b6c35f9d9b674e0ac3b56e.zip |
old
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/libtool/Manifest | 11 | ||||
-rw-r--r-- | sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch | 73 | ||||
-rw-r--r-- | sys-devel/libtool/files/libtool-2.2.2-flag-order.patch | 75 | ||||
-rw-r--r-- | sys-devel/libtool/libtool-2.2.2-r1.ebuild | 51 | ||||
-rw-r--r-- | sys-devel/libtool/libtool-2.2.2.ebuild | 46 |
5 files changed, 3 insertions, 253 deletions
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest index 6df6263966bd..8afebd6f766e 100644 --- a/sys-devel/libtool/Manifest +++ b/sys-devel/libtool/Manifest @@ -6,16 +6,11 @@ AUX 1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637 RMD160 f46d46cdd9e5 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 libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch 2150 RMD160 7b9173d367a3a9168b0f0db368e85941a18ec82e SHA1 50c150e11b10c707a8c98293e795c95e3edf6f41 SHA256 19b614022a4aa6336879974c551bbd094b8412b095a372595de2c5c1b73f9a9a -AUX libtool-2.2.2-flag-order.patch 2129 RMD160 72778ece0f72449a2ce0de556cc47019654dfe25 SHA1 fe765726f1a3f4e1b2ee7286e631ba359fb5225f SHA256 a6f4f896fdfd53ee08d27e3757b9a50884b48bbb7aa720be282c8c0e998ed554 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 -DIST libtool-2.2.2.tar.bz2 1447913 RMD160 0c8848f3cb0da548629c36c5f69dfd44a71c4250 SHA1 a7ce88fc92411380081fd47d3197e7d539755365 SHA256 906dcb99ac02eb921b77881b2778f60188219b74fd01ae85f56a23da2da9742b DIST libtool-2.2.4.tar.bz2 1919208 RMD160 3bafc6c02ee34bd80d3bd2c4164aa71a94347b14 SHA1 bc485fd07c8b12820234240e9ef41dba693af2b7 SHA256 c4e63399b12f5858d11c44cea8e92f21cd564f8548e488dadc84046b424c80fc EBUILD libtool-1.3.5.ebuild 800 RMD160 6c4fea1ab669d1a1926f176476fcba1f1fc84483 SHA1 a0fafa46ce16604a62bd56efdc65196730bb9397 SHA256 1d937d795219f49d8231ec0e11963043e4586da182603425f5b475d24600f49f EBUILD libtool-1.5.26.ebuild 2767 RMD160 4925000b25774e4e53dda375dc6fff7038f6944c SHA1 c6faa58ee70d0712f2c3179ee74dd7d9189422bc SHA256 9fc50159f1d7828a16d159c643ac2b012a92be181aa96656d799b2a450125e1d -EBUILD libtool-2.2.2-r1.ebuild 1331 RMD160 865472ddc2a3fc532face844dd2da3efa9e1f703 SHA1 cf9b0f3ad88befa2a1ff93709fc71d6ebfdfba52 SHA256 d923952d54ee8df09ef85bf6d33ac8273c1c0d7fcae7d64afd397320a6df44b9 -EBUILD libtool-2.2.2.ebuild 1186 RMD160 5496e4abac055746fd7450b3a19b544b7a75f7a0 SHA1 3709e56d226f2f86d807bbb56f84054bd213712d SHA256 400a6ed5c08327560c4bc44b9ca60669dc5eedb0d50d47171b67cf5d37ada0d3 EBUILD libtool-2.2.4.ebuild 1229 RMD160 54d488d9a560c1e252c3301e1afd2f5815b4c772 SHA1 b4551ab07f2f08f99de6ff4112871b6d94f68e42 SHA256 5274af136c501c4cd49abd42e01e6592f975442f806eeebf5152cf1ffdedd055 EBUILD libtool-9999.ebuild 1322 RMD160 d50ce91d8397b4b625dff1823ebc0568b3d41077 SHA1 2c48acd73319cb0b49673472f4fd5ba36fffb6d5 SHA256 4f482c366f3c070212bc182e69c185d10e34a254bc2e37c127deff3768d2650e MISC ChangeLog 20966 RMD160 da00a5fb4f3c0486d8043940662a83fb0726617a SHA1 bc6dc8289a56bc589b42c9d2a0dcda4909d3d4aa SHA256 c8e85b97590eeeda5cf3637ef53bd938be4c66fc0409ab1c848bbef15e1308cd @@ -23,7 +18,7 @@ MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFIHnxMj9hvisErhMIRAorCAKCq9FZWlRg3xwJzXScY/7l6w1xq/gCgt6hA -t+M/8845y7qgYaI6mkx1grY= -=4hy1 +iD8DBQFIHqstj9hvisErhMIRAnqvAJ9WsK6p8/nkCr3osuQZhRgbDGAHIQCgpG6A +j7oI8XzYs1VnA+xVwIPwW+U= +=FLQN -----END PGP SIGNATURE----- diff --git a/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch b/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch deleted file mode 100644 index 119f6ed63778..000000000000 --- a/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch +++ /dev/null @@ -1,73 +0,0 @@ -commit 9b00a3a6e7d231440029d8be120dff7faa15320e -Author: Andreas Schwab <schwab@suse.de> -Date: Tue Apr 22 21:32:32 2008 +0200 - - Fix default argument for AC_LIBLTDL_CONVENIENCE. - - * libltdl/m4/ltdl.m4 (AC_LIBLTDL_CONVENIENCE): Default argument - to libltdl. - (AC_LIBLTDL_INSTALLABLE): Likewise. - * tests/configure-iface.at (convenience libltdl): New test. - - Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - -diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4 -index bdecc9d..f6b1064 100644 ---- a/libltdl/m4/ltdl.m4 -+++ b/libltdl/m4/ltdl.m4 -@@ -79,7 +79,7 @@ _$0() - # AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools, - # now we have LT_CONFIG_LTDL_DIR: - AU_DEFUN([AC_LIBLTDL_CONVENIENCE], --[_LT_CONFIG_LTDL_DIR([$1]) -+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) - _LTDL_CONVENIENCE]) - - dnl aclocal-1.4 backwards compatibility: -@@ -135,7 +135,7 @@ _$0() - # AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools, - # now we have LT_CONFIG_LTDL_DIR: - AU_DEFUN([AC_LIBLTDL_INSTALLABLE], --[_LT_CONFIG_LTDL_DIR([$1]) -+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) - _LTDL_INSTALLABLE]) - - dnl aclocal-1.4 backwards compatibility: -diff --git a/tests/configure-iface.at b/tests/configure-iface.at -index 3fcb0da..9a311dc 100644 ---- a/tests/configure-iface.at -+++ b/tests/configure-iface.at -@@ -275,5 +275,33 @@ AT_CHECK([$MAKE -q main$EXEEXT || exit 1], [1], [ignore], [ignore]) - - AT_CLEANUP - -+ -+## -------------------- ## -+## Convenience libltdl. ## -+## -------------------- ## -+ -+AT_SETUP([convenience libltdl]) -+ -+AT_DATA([configure.ac], -+[[AC_INIT -+AC_CONFIG_AUX_DIR([libltdl/config]) -+AC_LIBLTDL_CONVENIENCE -+AC_LIBTOOL_DLOPEN -+AC_PROG_LIBTOOL -+AC_CONFIG_FILES(Makefile) -+AC_OUTPUT -+]]) -+AT_DATA([Makefile.in], -+[[LIBLTDL = @LIBLTDL@ -+print-ltdl: -+ echo $(LIBLTDL) -+]]) -+ -+LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [ignore], [ignore], [], [], [ignore]) -+AT_CHECK([$MAKE print-ltdl], [], [stdout]) -+AT_CHECK([grep libltdl/libltdlc.la stdout], [], [ignore]) -+ -+AT_CLEANUP -+ - dnl Be careful not to let the definition leak into other tests - m4_popdef([_LT_AT_LTDL_SETUP]) diff --git a/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch b/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch deleted file mode 100644 index 074a41cd4d0e..000000000000 --- a/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch +++ /dev/null @@ -1,75 +0,0 @@ -http://lists.gnu.org/archive/html/libtool/2008-04/msg00122.html - -commit 9c3ae35db6bbd9ce82bc5479354d99f53c46e888 -Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> -Date: Tue Apr 22 21:43:06 2008 +0200 - - Fix regression over 1.5.26 with ccache $CC -all-static. - - * libltdl/config/ltmain.m4sh (func_mode_link): Add - $link_static_flag to compile_command and link_command only - later, instead of right after a possible compiler wrapper. - * tests/static.at (ccache -all-static): New test. - * THANKS: Update. - Report by Richard Purdie. - - Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - -diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh -index ff1e50d..ac334dc 100644 ---- a/libltdl/config/ltmain.m4sh -+++ b/libltdl/config/ltmain.m4sh -@@ -3160,9 +3160,6 @@ func_mode_link () - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static -- # See comment for -static flag below, for more details. -- func_append compile_command " $link_static_flag" -- func_append finalize_command " $link_static_flag" - fi - prefer_static_libs=yes - ;; -@@ -3450,7 +3447,11 @@ func_mode_link () - - case $arg in - -all-static) -- # The effects of -all-static are defined in a previous loop. -+ if test -n "$link_static_flag"; then -+ # See comment for -static flag below, for more details. -+ func_append compile_command " $link_static_flag" -+ func_append finalize_command " $link_static_flag" -+ fi - continue - ;; - -diff --git a/tests/static.at b/tests/static.at -index 74b1c63..1a51d0d 100644 ---- a/tests/static.at -+++ b/tests/static.at -@@ -352,3 +352,26 @@ for withdep in no yes; do - done - - AT_CLEANUP -+ -+ -+AT_SETUP([ccache -all-static]) -+ -+AT_DATA([ccache], -+[[#! /bin/sh -+# poor man's ccache clone -+case $1 in -+-*) echo "bogus argument: $1" >&2; exit 1 ;; -+esac -+exec "$@" -+]]) -+chmod +x ./ccache -+ -+AT_DATA([a.c], -+[[int main(void) { return 0; } -+]]) -+ -+AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore]) -+AT_CHECK([$LIBTOOL --mode=link --tag=CC ./ccache $CC $CFLAGS $LDFLAGS -all-static a.$OBJEXT -o a], -+ [], [ignore]) -+ -+AT_CLEANUP diff --git a/sys-devel/libtool/libtool-2.2.2-r1.ebuild b/sys-devel/libtool/libtool-2.2.2-r1.ebuild deleted file mode 100644 index 5cbe276e5746..000000000000 --- a/sys-devel/libtool/libtool-2.2.2-r1.ebuild +++ /dev/null @@ -1,51 +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-2.2.2-r1.ebuild,v 1.2 2008/04/22 22:53:02 vapier Exp $ - -inherit eutils autotools - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="http://www.gnu.org/software/libtool/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -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" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-flag-order.patch - epatch "${FILESDIR}"/${P}-AC_LIBLTDL_CONVENIENCE.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 "${S}" - fi - - eautoreconf -} - -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 -} diff --git a/sys-devel/libtool/libtool-2.2.2.ebuild b/sys-devel/libtool/libtool-2.2.2.ebuild deleted file mode 100644 index bc16a03d71df..000000000000 --- a/sys-devel/libtool/libtool-2.2.2.ebuild +++ /dev/null @@ -1,46 +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-2.2.2.ebuild,v 1.1 2008/04/02 03:08:37 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.bz2" - -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" - -src_unpack() { - unpack ${A} - cd "${S}" - - use vanilla && return 0 - - epunt_cxx - cd libltdl/m4 - epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105 -} - -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 -} |