summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-05-05 06:37:28 +0000
committerMike Frysinger <vapier@gentoo.org>2008-05-05 06:37:28 +0000
commit1147571d0b061dc0d2e3d9d251b4be2ddc98c7c8 (patch)
treebab4a295deb566c402cd5774e389373087708a97 /sys-devel/libtool
parentmost packages are fixed so unmask libtool-2.2 (diff)
downloadgentoo-2-1147571d0b061dc0d2e3d9d251b4be2ddc98c7c8.tar.gz
gentoo-2-1147571d0b061dc0d2e3d9d251b4be2ddc98c7c8.tar.bz2
gentoo-2-1147571d0b061dc0d2e3d9d251b4be2ddc98c7c8.zip
old
(Portage version: 2.2_pre5)
Diffstat (limited to 'sys-devel/libtool')
-rw-r--r--sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch73
-rw-r--r--sys-devel/libtool/files/libtool-2.2.2-flag-order.patch75
-rw-r--r--sys-devel/libtool/libtool-2.2.2-r1.ebuild51
-rw-r--r--sys-devel/libtool/libtool-2.2.2.ebuild46
4 files changed, 0 insertions, 245 deletions
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
-}