From 03b82eb4796352b1daff05e9e67ce1aab8cc79db Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 24 Sep 2011 06:39:35 +0000 Subject: Restore libltdl.la and add a comment noting its requirement to prevent future screw-ups #383929 by Francesco Riosa. (Portage version: 2.2.0_alpha59/cvs/Linux x86_64) --- sys-devel/libtool/ChangeLog | 9 +++- sys-devel/libtool/libtool-2.4-r2.ebuild | 87 ------------------------------- sys-devel/libtool/libtool-2.4-r3.ebuild | 90 +++++++++++++++++++++++++++++++++ sys-devel/libtool/libtool-9999.ebuild | 7 ++- 4 files changed, 103 insertions(+), 90 deletions(-) delete mode 100644 sys-devel/libtool/libtool-2.4-r2.ebuild create mode 100644 sys-devel/libtool/libtool-2.4-r3.ebuild (limited to 'sys-devel/libtool') diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog index 904bad7b97cb..2cb939a9c56f 100644 --- a/sys-devel/libtool/ChangeLog +++ b/sys-devel/libtool/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/libtool # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.192 2011/09/23 04:17:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.193 2011/09/24 06:39:35 vapier Exp $ + +*libtool-2.4-r3 (24 Sep 2011) + + 24 Sep 2011; Mike Frysinger -libtool-2.4-r2.ebuild, + +libtool-2.4-r3.ebuild, libtool-9999.ebuild: + Restore libltdl.la and add a comment noting its requirement to prevent future + screw-ups #383929 by Francesco Riosa. *libtool-2.4-r2 (23 Sep 2011) diff --git a/sys-devel/libtool/libtool-2.4-r2.ebuild b/sys-devel/libtool/libtool-2.4-r2.ebuild deleted file mode 100644 index 60593f52db0f..000000000000 --- a/sys-devel/libtool/libtool-2.4-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r2.ebuild,v 1.1 2011/09/23 04:17:36 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 vanilla" - -RDEPEND="sys-devel/gnuconfig - ! ${P}.tar #356089 - unpack ./${P}.tar - fi -} - -src_prepare() { - use vanilla && return 0 - - epatch "${FILESDIR}"/${P}-openmp.patch #349078 - - epunt_cxx - 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 - use static-libs || find "${D}" -name libltdl.la -delete - 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-r3.ebuild b/sys-devel/libtool/libtool-2.4-r3.ebuild new file mode 100644 index 000000000000..155795939c6a --- /dev/null +++ b/sys-devel/libtool/libtool-2.4-r3.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r3.ebuild,v 1.1 2011/09/24 06:39:35 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 vanilla" + +RDEPEND="sys-devel/gnuconfig + ! ${P}.tar #356089 + unpack ./${P}.tar + fi +} + +src_prepare() { + use vanilla && return 0 + + epatch "${FILESDIR}"/${P}-openmp.patch #349078 + + epunt_cxx + 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 + + 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-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild index 855e413d72ad..7f1555b04a7c 100644 --- a/sys-devel/libtool/libtool-9999.ebuild +++ b/sys-devel/libtool/libtool-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.7 2011/09/23 04:17:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.8 2011/09/24 06:39:35 vapier Exp $ EAPI="2" #356089 @@ -67,9 +67,12 @@ src_configure() { src_install() { emake DESTDIR="${D}" install || die - use static-libs || find "${D}" -name libltdl.la -delete 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 + for x in $(find "${D}" -name config.guess -o -name config.sub) ; do rm -f "${x}" ; ln -sf /usr/share/gnuconfig/${x##*/} "${x}" done -- cgit v1.2.3-65-gdbad