diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-01-20 03:19:36 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-20 03:19:36 +0000 |
| commit | bbc9f0d4e523f2ba001fe8eb255aaaf98d0fd9e5 (patch) | |
| tree | a28d6713769221f9ee6180566568061df8f91e71 | |
| parent | Marked as stable. (Manifest recommit) (diff) | |
| download | gentoo-2-bbc9f0d4e523f2ba001fe8eb255aaaf98d0fd9e5.tar.gz gentoo-2-bbc9f0d4e523f2ba001fe8eb255aaaf98d0fd9e5.tar.bz2 gentoo-2-bbc9f0d4e523f2ba001fe8eb255aaaf98d0fd9e5.zip | |
Touch up portage patch to pass libtools `make check` #70350.
(Portage version: 2.0.51-r13)
| -rw-r--r-- | sys-devel/libtool/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch | 24 |
2 files changed, 19 insertions, 11 deletions
diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog index 03b4a0919e89..5fa37eccca09 100644 --- a/sys-devel/libtool/ChangeLog +++ b/sys-devel/libtool/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/libtool # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.65 2005/01/19 23:27:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.66 2005/01/20 03:19:36 vapier Exp $ + + 19 Jan 2005; Mike Frysinger <vapier@gentoo.org> + files/1.4.3/libtool-1.4.2-portage.patch: + Touch up portage patch to pass libtools `make check` #70350. 19 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/1.5.6/libtool-1.5-filter-host-tags.patch: diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch index 2da7b12c2332..8212add90a74 100644 --- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch +++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch @@ -1,6 +1,6 @@ --- ltmain.in.orig Wed Apr 3 01:19:37 2002 +++ ltmain.in Sun May 26 19:50:52 2002 -@@ -3940,9 +3940,46 @@ +@@ -3940,9 +3940,50 @@ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 fi @@ -8,30 +8,33 @@ + # 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'`" ++ 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 |$EGREP -e "$mynewdependency_lib"`"; then ++ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` ++ if test -z "$my_little_ninja_foo_1"; 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. ++ # 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 |$EGREP -e "$S"`" && test "$S"; then ++ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` ++ if test -n "$my_little_ninja_foo_2" && test "$S"; then + mynewdependency_lib="" + # We do not want portage's install root ($D) present. -+ elif test -n "`echo $deplib |$EGREP -e "$D"`" && test "$D"; then -+ eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`" ++ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` ++ elif test -n "$my_little_ninja_foo_3" && test "$D"; then ++ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'` + else + mynewdependency_lib="$deplib" + fi @@ -40,7 +43,8 @@ + fi + # Do not add duplicates + if test "$mynewdependency_lib"; then -+ if test -z "`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`"; then ++ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` ++ if test -z "$my_little_ninja_foo_4"; then + newdependency_libs="$newdependency_libs $mynewdependency_lib" + fi + fi @@ -55,7 +59,7 @@ 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'`" ++ install_libdir=`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'` + fi $echo > $output "\ # $outputname - a libtool library file |