diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-02-23 17:28:24 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-02-23 17:28:24 +0000 |
| commit | 0511403c34f807cd0e3fc703e15616f11fcd617b (patch) | |
| tree | 488b9fee92f609f75e9f91333e6f59e7e49e96be /eclass/ELT-patches | |
| parent | Add comment. (diff) | |
| download | gentoo-2-0511403c34f807cd0e3fc703e15616f11fcd617b.tar.gz gentoo-2-0511403c34f807cd0e3fc703e15616f11fcd617b.tar.bz2 gentoo-2-0511403c34f807cd0e3fc703e15616f11fcd617b.zip | |
Bug #83081.
Diffstat (limited to 'eclass/ELT-patches')
| -rw-r--r-- | eclass/ELT-patches/portage/1.4.1 | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/eclass/ELT-patches/portage/1.4.1 b/eclass/ELT-patches/portage/1.4.1 index d4592784c4bc..f07161122e6b 100644 --- a/eclass/ELT-patches/portage/1.4.1 +++ b/eclass/ELT-patches/portage/1.4.1 @@ -1,6 +1,14 @@ ---- ltmain.sh Wed Apr 3 01:19:37 2002 -+++ ltmain.sh Sun May 26 19:50:52 2002 -@@ -3940,9 +3940,46 @@ +Note that if you update this patch, please update this one as well: + + eclass/ELT-patches/portage/1.4.1 + +The file name can stay 1.4.1, as it will still apply to all versions. Only +when a new version of libtool comes out that it do not apply to, then the +name should be bumped, but the patch content should stay fairly the same. + +--- ltmain.in.orig Wed Apr 3 01:19:37 2002 ++++ ltmain.in Sun May 26 19:50:52 2002 +@@ -3940,9 +3940,50 @@ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 fi @@ -8,30 +16,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 |grep -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 |grep -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 |grep -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 +51,8 @@ + fi + # Do not add duplicates + if test "$mynewdependency_lib"; then -+ if test -z "`echo $newdependency_libs |grep -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 +67,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 |