diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2015-02-18 09:58:42 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-02-18 09:58:42 +0000 |
commit | d69cd622c34bbe5cfbb4c41fa107b5c973fdb380 (patch) | |
tree | 05b3a11773df589ec06885db7f33b4858a1f10b9 /sys-devel/libtool | |
parent | Switch back to xz compressed tarball (diff) | |
download | gentoo-2-d69cd622c34bbe5cfbb4c41fa107b5c973fdb380.tar.gz gentoo-2-d69cd622c34bbe5cfbb4c41fa107b5c973fdb380.tar.bz2 gentoo-2-d69cd622c34bbe5cfbb4c41fa107b5c973fdb380.zip |
Switch back to xz compressed tarball. Removed old versions
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-devel/libtool')
-rw-r--r-- | sys-devel/libtool/ChangeLog | 7 | ||||
-rw-r--r-- | sys-devel/libtool/files/libtool-2.4-openmp.patch | 59 | ||||
-rw-r--r-- | sys-devel/libtool/libtool-2.4-r1.ebuild | 69 | ||||
-rw-r--r-- | sys-devel/libtool/libtool-2.4-r4.ebuild | 94 | ||||
-rw-r--r-- | sys-devel/libtool/libtool-2.4.6.ebuild | 4 |
5 files changed, 8 insertions, 225 deletions
diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog index 0b4fb0756ed2..44ed7cad44a8 100644 --- a/sys-devel/libtool/ChangeLog +++ b/sys-devel/libtool/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/libtool # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.244 2015/02/15 22:38:29 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.245 2015/02/18 09:58:42 polynomial-c Exp $ + + 18 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> -libtool-2.4-r1.ebuild, + -libtool-2.4-r4.ebuild, libtool-2.4.6.ebuild, + -files/libtool-2.4-openmp.patch: + Switch back to xz compressed tarball. Removed old versions. *libtool-2.4.6 (15 Feb 2015) diff --git a/sys-devel/libtool/files/libtool-2.4-openmp.patch b/sys-devel/libtool/files/libtool-2.4-openmp.patch deleted file mode 100644 index 94e0bcee564e..000000000000 --- a/sys-devel/libtool/files/libtool-2.4-openmp.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://bugs.gentoo.org/349078 - -From 1b76054f4763a28ae1b01fbeee86ba0c524d1923 Mon Sep 17 00:00:00 2001 -From: Justin Lecher <jlec@gentoo.org> -Date: Mon, 14 Mar 2011 08:40:50 +0100 -Subject: [PATCH] Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines. - -If -fopenmp if passed to gcc during linking, it will take care to add all -necessary libs to link correctly for openmp support. Currently libtool filters -those flags, similar as it was the case with the threading flags. This change -handles the situation for the openmp support similar as before the thread -support was fixed. - -http://lists.gnu.org/archive/html/bug-libtool/2010-12/msg00009.html -http://lists.gnu.org/archive/html/bug-libtool/2011-03/msg00014.html - -* libltdl/config/ltmain.m4sh (func_mode_link): Treat OpenMP -flags like pthreads flags. - -Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> ---- - ChangeLog | 7 +++++++ - libltdl/config/ltmain.m4sh | 6 ++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -2011-03-22 Justin Lecher <jlec@gentoo.org> (tiny change) - Rhys Ulerich <rhys.ulerich@gmail.com> (tiny change) - - Don't filter OPENMP flags (-openmp & -fopenmp) from linker lines. - * libltdl/config/ltmain.m4sh (func_mode_link): Treat OpenMP - flags like pthreads flags. - -diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh -index 766777f..9358ec5 100644 ---- a/libltdl/config/ltmain.m4sh -+++ b/libltdl/config/ltmain.m4sh -@@ -4865,7 +4865,8 @@ func_mode_link () - continue - ;; - -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ -+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" -@@ -5369,7 +5370,8 @@ func_mode_link () - lib= - found=no - case $deplib in -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ -+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" --- -1.7.6.1 - diff --git a/sys-devel/libtool/libtool-2.4-r1.ebuild b/sys-devel/libtool/libtool-2.4-r1.ebuild deleted file mode 100644 index 9ae2c9d95875..000000000000 --- a/sys-devel/libtool/libtool-2.4-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r1.ebuild,v 1.11 2012/04/09 00:32:11 vapier Exp $ - -EAPI="2" #356089 - -LIBTOOLIZE="true" #225559 -WANT_LIBTOOL="none" -inherit eutils autotools multilib - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="http://www.gnu.org/software/libtool/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="test vanilla" - -RDEPEND="sys-devel/gnuconfig - !<sys-devel/autoconf-2.62:2.5 - !<sys-devel/automake-1.11.1:1.11 - !=sys-devel/libtool-2*:1.5" -DEPEND="${RDEPEND} - test? ( !<sys-devel/binutils-2.20 ) - app-arch/xz-utils" - -src_unpack() { - xz -dc "${DISTDIR}"/${A} > ${P}.tar #356089 - unpack ./${P}.tar -} - -src_prepare() { - if ! use vanilla ; then - cd libltdl/m4 - epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105 - cd .. - AT_NOELIBTOOLIZE=yes eautoreconf - cd .. - AT_NOELIBTOOLIZE=yes eautoreconf - fi -} - -src_configure() { - # the libtool script uses bash code in it and at configure time, tries - # to find a bash shell. if /bin/sh is bash, it uses that. this can - # cause problems for people who switch /bin/sh on the fly to other - # shells, so just force libtool to use /bin/bash all the time. - export CONFIG_SHELL=/bin/bash - - default -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS - - for x in $(find "${D}" -name config.guess -o -name config.sub) ; do - rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}" - done -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/libltdl.so.3 -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3 -} diff --git a/sys-devel/libtool/libtool-2.4-r4.ebuild b/sys-devel/libtool/libtool-2.4-r4.ebuild deleted file mode 100644 index 66613db5ac2d..000000000000 --- a/sys-devel/libtool/libtool-2.4-r4.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r4.ebuild,v 1.2 2012/04/09 00:32:11 vapier Exp $ - -EAPI="2" #356089 - -LIBTOOLIZE="true" #225559 -WANT_LIBTOOL="none" -inherit eutils autotools multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git - http://git.savannah.gnu.org/r/${PN}.git" - inherit git-2 -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -fi - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="http://www.gnu.org/software/libtool/" - -LICENSE="GPL-2" -SLOT="2" -IUSE="static-libs test vanilla" - -RDEPEND="sys-devel/gnuconfig - !<sys-devel/autoconf-2.62:2.5 - !<sys-devel/automake-1.11.1:1.11 - !=sys-devel/libtool-2*:1.5" -DEPEND="${RDEPEND} - test? ( !<sys-devel/binutils-2.20 ) - app-arch/xz-utils" -[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-2_src_unpack - cd "${S}" - ./bootstrap || die - else - xz -dc "${DISTDIR}"/${A} > ${P}.tar #356089 - unpack ./${P}.tar - fi -} - -src_prepare() { - use vanilla && return 0 - - epatch "${FILESDIR}"/${P}-openmp.patch #349078 - - cd libltdl/m4 - epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105 - cd .. - AT_NOELIBTOOLIZE=yes eautoreconf - cd .. - AT_NOELIBTOOLIZE=yes eautoreconf -} - -src_configure() { - # the libtool script uses bash code in it and at configure time, tries - # to find a bash shell. if /bin/sh is bash, it uses that. this can - # cause problems for people who switch /bin/sh on the fly to other - # shells, so just force libtool to use /bin/bash all the time. - export CONFIG_SHELL=/bin/bash - - econf $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS - - # While the libltdl.la file is not used directly, the m4 ltdl logic - # keys off of its existence when searching for ltdl support. #293921 - #use static-libs || find "${D}" -name libltdl.la -delete - - # Building libtool with --disable-static will cause the installed - # helper to not build static objects by default. This is undesirable - # for crappy packages that utilize the system libtool, so undo that. - dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die - - for x in $(find "${D}" -name config.guess -o -name config.sub) ; do - rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}" - done -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/libltdl.so.3 -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3 -} diff --git a/sys-devel/libtool/libtool-2.4.6.ebuild b/sys-devel/libtool/libtool-2.4.6.ebuild index 93004c7f15d9..f9fe22606833 100644 --- a/sys-devel/libtool/libtool-2.4.6.ebuild +++ b/sys-devel/libtool/libtool-2.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.6.ebuild,v 1.1 2015/02/15 22:38:29 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.6.ebuild,v 1.2 2015/02/18 09:58:42 polynomial-c Exp $ EAPI="4" @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then http://git.savannah.gnu.org/r/${PN}.git" inherit git-2 else - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" fi |