From 2fbfc1c31d7dac1b90145caab7ef37bf40574709 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Wed, 3 Jul 2002 19:11:10 +0000 Subject: fix $S still being around in some cases --- sys-devel/libtool/ChangeLog | 10 +++- .../files/1.4.1/libtool-1.4.1-portage.patch-v6 | 62 ++++++++++++++++++++++ sys-devel/libtool/files/digest-libtool-1.4.1-r6 | 1 - sys-devel/libtool/files/digest-libtool-1.4.1-r7 | 1 - sys-devel/libtool/files/digest-libtool-1.4.1-r9 | 1 + sys-devel/libtool/libtool-1.4.1-r6.ebuild | 58 -------------------- sys-devel/libtool/libtool-1.4.1-r7.ebuild | 58 -------------------- sys-devel/libtool/libtool-1.4.1-r9.ebuild | 56 +++++++++++++++++++ 8 files changed, 128 insertions(+), 119 deletions(-) create mode 100644 sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 delete mode 100644 sys-devel/libtool/files/digest-libtool-1.4.1-r6 delete mode 100644 sys-devel/libtool/files/digest-libtool-1.4.1-r7 create mode 100644 sys-devel/libtool/files/digest-libtool-1.4.1-r9 delete mode 100644 sys-devel/libtool/libtool-1.4.1-r6.ebuild delete mode 100644 sys-devel/libtool/libtool-1.4.1-r7.ebuild create mode 100644 sys-devel/libtool/libtool-1.4.1-r9.ebuild (limited to 'sys-devel') diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog index 7f3854ddff1a..9aabea8d6c41 100644 --- a/sys-devel/libtool/ChangeLog +++ b/sys-devel/libtool/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-devel/libtool # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.8 2002/06/26 22:40:14 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.9 2002/07/03 19:11:10 azarah Exp $ + +*libtool-1.4.1-r9 (3 Jul 2002) + + 3 Jul 2002; Martin Schlemmer : + + Fix a bug in libtool-1.4.1-portage.patch-v? .. basically just a type o. Also + Enhanced it to be able to use $PWORKDIR ($WORKDIR in ebuilds) that the latest + portage should export. 27 Jun 2002; Martin Schlemmer : diff --git a/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 b/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 new file mode 100644 index 000000000000..2d15d2e05676 --- /dev/null +++ b/sys-devel/libtool/files/1.4.1/libtool-1.4.1-portage.patch-v6 @@ -0,0 +1,62 @@ +--- ltmain.sh.orig Wed Apr 3 01:19:37 2002 ++++ ltmain.sh Sun May 26 19:50:52 2002 +@@ -3940,9 +3940,46 @@ + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 + exit 1 + fi +- newdependency_libs="$newdependency_libs $libdir/$name" ++ # We do not want portage's install root ($D) present. Check only for ++ # this if the .la is being installed. ++ if test "$installed" = yes && test "$D"; then ++ eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`" ++ else ++ mynewdependency_lib="$libdir/$name" ++ fi ++ # Do not add duplicates ++ if test "$mynewdependency_lib"; then ++ if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then ++ newdependency_libs="$newdependency_libs $mynewdependency_lib" ++ fi ++ fi ++ ;; ++ *) ++ if test "$installed" = yes; then ++ # Rather use S=WORKDIR if our version of portage supports it. ++ # This is because some ebuild (gcc) do not use $S as buildroot. ++ if test "$PWORKDIR"; then ++ S="$PWORKDIR" ++ fi ++ # We do not want portage's build root ($S) present. ++ if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then ++ mynewdependency_lib="" ++ # We do not want portage's install root ($D) present. ++ elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then ++ eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`" ++ else ++ mynewdependency_lib="$deplib" ++ fi ++ else ++ mynewdependency_lib="$deplib" ++ fi ++ # Do not add duplicates ++ if test "$mynewdependency_lib"; then ++ if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then ++ newdependency_libs="$newdependency_libs $mynewdependency_lib" ++ fi ++ fi + ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" +@@ -3975,6 +4005,10 @@ + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac ++ # Do not add duplicates ++ if test "$installed" = yes && test "$D"; then ++ install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`" ++ fi + $echo > $output "\ + # $outputname - a libtool library file + # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP diff --git a/sys-devel/libtool/files/digest-libtool-1.4.1-r6 b/sys-devel/libtool/files/digest-libtool-1.4.1-r6 deleted file mode 100644 index ce6a480b1e86..000000000000 --- a/sys-devel/libtool/files/digest-libtool-1.4.1-r6 +++ /dev/null @@ -1 +0,0 @@ -MD5 28582af0b96513f223e970db1a9a5cde libtool-1.4.1.tar.gz 1129676 diff --git a/sys-devel/libtool/files/digest-libtool-1.4.1-r7 b/sys-devel/libtool/files/digest-libtool-1.4.1-r7 deleted file mode 100644 index ce6a480b1e86..000000000000 --- a/sys-devel/libtool/files/digest-libtool-1.4.1-r7 +++ /dev/null @@ -1 +0,0 @@ -MD5 28582af0b96513f223e970db1a9a5cde libtool-1.4.1.tar.gz 1129676 diff --git a/sys-devel/libtool/files/digest-libtool-1.4.1-r9 b/sys-devel/libtool/files/digest-libtool-1.4.1-r9 new file mode 100644 index 000000000000..ce6a480b1e86 --- /dev/null +++ b/sys-devel/libtool/files/digest-libtool-1.4.1-r9 @@ -0,0 +1 @@ +MD5 28582af0b96513f223e970db1a9a5cde libtool-1.4.1.tar.gz 1129676 diff --git a/sys-devel/libtool/libtool-1.4.1-r6.ebuild b/sys-devel/libtool/libtool-1.4.1-r6.ebuild deleted file mode 100644 index c51859b3ce2f..000000000000 --- a/sys-devel/libtool/libtool-1.4.1-r6.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.1-r6.ebuild,v 1.1 2002/04/10 18:48:35 azarah Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="A shared library tool for developers" -SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html" - -DEPEND="virtual/glibc" - -SLOT="0" - -src_unpack() { - unpack ${A} - - # Fix the relink problem where the relinked libs do not get - # installed. It is *VERY* important that you get a updated - # 'libtool-${PV}-relink.patch' if you update this, as it - # fixes a very serious bug. Please not that this patch is - # included in 'libtool-${PV}-gentoo.patch' for this ebuild. - # - # NOTE: all affected apps should get a 'libtoolize --copy --force' - # added to upate libtool - # - - cd ${S} - patch -p1 <${FILESDIR}/${PV}/${P}-nonneg.patch || die - patch -p0 <${FILESDIR}/${PV}/${P}-relink.patch || die - #fixes quoting for test's .. *VERY* important! - patch -p0 <${FILESDIR}/${PV}/${P}-test.patch || die - patch -p1 <${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die -} - -src_compile() { - ./configure --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info || die - - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc AUTHORS COPYING ChangeLog* NEWS \ - README THANKS TODO doc/PLATFORMS - - cd ${D}/usr/share/libtool - patch -p0 <${FILESDIR}/${PV}/${P}-ltmain.sh-hack.patch || die - # Do not create bogus entries in $dependency_libs or $libdir - # with ${D} or ${S} in them. - # - # Azarah - 07 April 2002 - patch -p0 <${FILESDIR}/${PV}/${P}-portage.patch-v3 || die -} - diff --git a/sys-devel/libtool/libtool-1.4.1-r7.ebuild b/sys-devel/libtool/libtool-1.4.1-r7.ebuild deleted file mode 100644 index 03da380fd10e..000000000000 --- a/sys-devel/libtool/libtool-1.4.1-r7.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.1-r7.ebuild,v 1.1 2002/05/26 17:59:59 azarah Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="A shared library tool for developers" -SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html" - -DEPEND="virtual/glibc" - -SLOT="0" - -src_unpack() { - unpack ${A} - - # Fix the relink problem where the relinked libs do not get - # installed. It is *VERY* important that you get a updated - # 'libtool-${PV}-relink.patch' if you update this, as it - # fixes a very serious bug. Please not that this patch is - # included in 'libtool-${PV}-gentoo.patch' for this ebuild. - # - # NOTE: all affected apps should get a 'libtoolize --copy --force' - # added to upate libtool - # - - cd ${S} - patch -p1 <${FILESDIR}/${PV}/${P}-nonneg.patch || die - patch -p0 <${FILESDIR}/${PV}/${P}-relink.patch || die - #fixes quoting for test's .. *VERY* important! - patch -p0 <${FILESDIR}/${PV}/${P}-test.patch || die - patch -p1 <${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die -} - -src_compile() { - ./configure --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info || die - - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc AUTHORS COPYING ChangeLog* NEWS \ - README THANKS TODO doc/PLATFORMS - - cd ${D}/usr/share/libtool - patch -p0 <${FILESDIR}/${PV}/${P}-ltmain.sh-hack.patch || die - # Do not create bogus entries in $dependency_libs or $libdir - # with ${D} or ${S} in them. - # - # Azarah - 07 April 2002 - patch -p0 <${FILESDIR}/${PV}/${P}-portage.patch-v4 || die -} - diff --git a/sys-devel/libtool/libtool-1.4.1-r9.ebuild b/sys-devel/libtool/libtool-1.4.1-r9.ebuild new file mode 100644 index 000000000000..d142486113d1 --- /dev/null +++ b/sys-devel/libtool/libtool-1.4.1-r9.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Author Daniel Robbins +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.1-r9.ebuild,v 1.1 2002/07/03 19:11:10 azarah Exp $ + +S=${WORKDIR}/${P} +DESCRIPTION="A shared library tool for developers" +SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz" +HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html" + +DEPEND="virtual/glibc" + +SLOT="0" + +src_unpack() { + unpack ${A} + + # Fix the relink problem where the relinked libs do not get + # installed. It is *VERY* important that you get a updated + # 'libtool-${PV}-relink.patch' if you update this, as it + # fixes a very serious bug. Please not that this patch is + # included in 'libtool-${PV}-gentoo.patch' for this ebuild. + # + # NOTE: all affected apps should get a 'libtoolize --copy --force' + # added to upate libtool + # + + cd ${S} + patch -p1 <${FILESDIR}/${PV}/${P}-nonneg.patch || die + patch -p0 <${FILESDIR}/${PV}/${P}-relink.patch || die + #fixes quoting for test's .. *VERY* important! + patch -p0 <${FILESDIR}/${PV}/${P}-test.patch || die + patch -p1 <${FILESDIR}/${PV}/${P}-duplicate-dependency.patch || die + patch -p0 <${FILESDIR}/${PV}/${P}-ltmain.sh-hack.patch || die + # Do not create bogus entries in $dependency_libs or $libdir + # with ${D} or ${S} in them. + # + # Azarah - 07 April 2002 + patch -p0 <${FILESDIR}/${PV}/${P}-portage.patch-v6 || die +} + +src_compile() { + ./configure --host=${CHOST} \ + --prefix=/usr \ + --infodir=/usr/share/info || die + + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + + dodoc AUTHORS COPYING ChangeLog* NEWS \ + README THANKS TODO doc/PLATFORMS +} + -- cgit v1.2.3-65-gdbad