diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-05-13 11:12:43 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-05-13 11:12:43 +0000 |
| commit | aea225aa7d88e5900066849ad0925a45433b23da (patch) | |
| tree | 3641465f474006d484754dc7096c89c7acbcc4b1 /eclass/ELT-patches | |
| parent | version bump (diff) | |
| download | gentoo-2-aea225aa7d88e5900066849ad0925a45433b23da.tar.gz gentoo-2-aea225aa7d88e5900066849ad0925a45433b23da.tar.bz2 gentoo-2-aea225aa7d88e5900066849ad0925a45433b23da.zip | |
Add 1.3.4 patch - bug #92350.
Diffstat (limited to 'eclass/ELT-patches')
| -rw-r--r-- | eclass/ELT-patches/portage/1.3.4 | 71 | ||||
| -rw-r--r-- | eclass/ELT-patches/sed/1.3.4 | 14 |
2 files changed, 85 insertions, 0 deletions
diff --git a/eclass/ELT-patches/portage/1.3.4 b/eclass/ELT-patches/portage/1.3.4 new file mode 100644 index 000000000000..3809fb815e87 --- /dev/null +++ b/eclass/ELT-patches/portage/1.3.4 @@ -0,0 +1,71 @@ +--- ltmain.sh 2005-05-13 10:53:28.000000000 +0200 ++++ ltmain.sh 2005-05-13 11:44:15.000000000 +0200 +@@ -3078,6 +3078,68 @@ + break + fi + output="$output_objdir/$outputname"i ++ # Replace all uninstalled libtool libraries with the installed ones ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ case $deplib in ++ *.la) ++ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ if test -z "$libdir"; then ++ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ # 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 ++ 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. ++ if test "$PWORKDIR"; then ++ S="$PWORKDIR" ++ fi ++ # We do not want portage's build root ($S) present. ++ 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. ++ 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 ++ else ++ mynewdependency_lib="$deplib" ++ fi ++ # Do not add duplicates ++ if test "$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 ++ ;; ++ esac ++ done ++ dependency_libs="$newdependency_libs" ++ fi ++ # 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 + $rm $output + $echo > $output "\ diff --git a/eclass/ELT-patches/sed/1.3.4 b/eclass/ELT-patches/sed/1.3.4 new file mode 100644 index 000000000000..c88ff727a7e1 --- /dev/null +++ b/eclass/ELT-patches/sed/1.3.4 @@ -0,0 +1,14 @@ +--- ltmain.sh 2005-05-13 11:48:24.000000000 +0200 ++++ ltmain.sh 2005-05-13 11:48:42.000000000 +0200 +@@ -47,6 +47,11 @@ + exit 0 + fi + ++# define variables for historic ltconfig's generated by Libtool 1.3 ++test -z "$SED" && SED=sed ++test -z "$EGREP" && EGREP=egrep ++test -z "$LTCC" && LTCC=${CC-gcc} ++ + # The name of this program. + progname=`$echo "$0" | sed 's%^.*/%%'` + modename="$progname" |