diff options
| -rw-r--r-- | eclass/ELT-patches/portage/1.3.4 | 71 | ||||
| -rw-r--r-- | eclass/ELT-patches/portage/1.4.1 | 74 | ||||
| -rw-r--r-- | eclass/ELT-patches/sed/1.4.3 | 14 | ||||
| -rw-r--r-- | eclass/ELT-patches/test/1.4.1 | 291 |
4 files changed, 0 insertions, 450 deletions
diff --git a/eclass/ELT-patches/portage/1.3.4 b/eclass/ELT-patches/portage/1.3.4 deleted file mode 100644 index 8dab92914e91..000000000000 --- a/eclass/ELT-patches/portage/1.3.4 +++ /dev/null @@ -1,71 +0,0 @@ ---- 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"` -+ # We do not want portage's install root ($D) present. -+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" -+ 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/portage/1.4.1 b/eclass/ELT-patches/portage/1.4.1 deleted file mode 100644 index 6152dfd6fe4b..000000000000 --- a/eclass/ELT-patches/portage/1.4.1 +++ /dev/null @@ -1,74 +0,0 @@ -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.sh Wed Apr 3 01:19:37 2002 -+++ ltmain.sh 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 -- 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 -+ 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"` -+ # We do not want portage's install root ($D) present. -+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` -+ if test -n "$my_little_ninja_foo_2" && test "$S"; then -+ mynewdependency_lib="" -+ 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 - ;; -- *) 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/eclass/ELT-patches/sed/1.4.3 b/eclass/ELT-patches/sed/1.4.3 deleted file mode 100644 index 9c51ac2de0ff..000000000000 --- a/eclass/ELT-patches/sed/1.4.3 +++ /dev/null @@ -1,14 +0,0 @@ ---- ltmain.sh 2003-02-13 14:54:24.000000000 +0100 -+++ ltmain.sh 2003-02-13 15:24:49.000000000 +0100 -@@ -48,6 +48,11 @@ EOF - 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" diff --git a/eclass/ELT-patches/test/1.4.1 b/eclass/ELT-patches/test/1.4.1 deleted file mode 100644 index d6f442f0e38d..000000000000 --- a/eclass/ELT-patches/test/1.4.1 +++ /dev/null @@ -1,291 +0,0 @@ ---- ltmain.sh Tue May 29 19:16:03 2001 -+++ ltmain.sh Tue May 29 21:26:50 2001 -@@ -459,7 +459,7 @@ - pic_mode=default - ;; - esac -- if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then -+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi -@@ -1343,7 +1343,7 @@ - ;; - esac - for pass in $passes; do -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - # Determine which files to process - case $pass in - dlopen) -@@ -1360,11 +1360,11 @@ - found=no - case $deplib in - -l*) -- if test $linkmode = oldlib && test $linkmode = obj; then -+ if test "$linkmode" = oldlib && test "$linkmode" = obj; then - $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 - continue - fi -- if test $pass = conv; then -+ if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi -@@ -1384,7 +1384,7 @@ - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" -- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi -@@ -1393,16 +1393,16 @@ - case $linkmode in - lib) - deplibs="$deplib $deplibs" -- test $pass = conv && continue -+ test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) -- if test $pass = conv; then -+ if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi -- if test $pass = scan; then -+ if test "$pass" = scan; then - deplibs="$deplib $deplibs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - else -@@ -1417,7 +1417,7 @@ - continue - ;; # -L - -R*) -- if test $pass = link; then -+ if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in -@@ -1430,7 +1430,7 @@ - ;; - *.la) lib="$deplib" ;; - *.$libext) -- if test $pass = conv; then -+ if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi -@@ -1451,7 +1451,7 @@ - continue - ;; - prog) -- if test $pass != link; then -+ if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" -@@ -1462,7 +1462,7 @@ - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) -- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" -@@ -1512,13 +1512,13 @@ - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || -- { test $linkmode = oldlib && test $linkmode = obj; }; then -+ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then - # Add dl[pre]opened files of deplib - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - -- if test $pass = conv; then -+ if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then -@@ -1537,7 +1537,7 @@ - esac - tmp_libs="$tmp_libs $deplib" - done -- elif test $linkmode != prog && test $linkmode != lib; then -+ elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit 1 - fi -@@ -1555,7 +1555,7 @@ - fi - - # This library was specified with -dlopen. -- if test $pass = dlopen; then -+ if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit 1 -@@ -1604,7 +1604,7 @@ - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. -- if test $pass = dlpreopen; then -+ if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit 1 -@@ -1623,7 +1623,7 @@ - - if test -z "$libdir"; then - # Link the convenience library -- if test $linkmode = lib; then -+ if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" -@@ -1634,7 +1634,7 @@ - continue - fi - -- if test $linkmode = prog && test $pass != link; then -+ if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - -@@ -1671,7 +1671,7 @@ - # Link against this shared library - - if test "$linkmode,$pass" = "prog,link" || -- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then -+ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. -@@ -1693,7 +1693,7 @@ - esac - ;; - esac -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - # We need to hardcode the library path - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. -@@ -1777,7 +1777,7 @@ - linklib=$newlib - fi # test -n $old_archive_from_expsyms_cmds - -- if test $linkmode = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -1826,7 +1826,7 @@ - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else -@@ -1843,7 +1843,7 @@ - fi - fi - -- if test $linkmode = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -1865,7 +1865,7 @@ - add="-l$name" - fi - -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else -@@ -1873,7 +1873,7 @@ - test -n "$add" && deplibs="$add $deplibs" - fi - fi -- elif test $linkmode = prog; then -+ elif test "$linkmode" = prog; then - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && -@@ -1932,9 +1932,9 @@ - fi - fi # link shared/static library? - -- if test $linkmode = lib; then -+ if test "$linkmode" = lib; then - if test -n "$dependency_libs" && -- { test $hardcode_into_libs != yes || test $build_old_libs = yes || -+ { test "$hardcode_into_libs" != yes || test $build_old_libs = yes || - test $link_static = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= -@@ -1964,7 +1964,7 @@ - tmp_libs="$tmp_libs $deplib" - done - -- if test $link_all_deplibs != no; then -+ if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in -@@ -2007,15 +2007,15 @@ - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs -- if test $pass = dlpreopen; then -+ if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi -- if test $pass != dlopen; then -- test $pass != scan && dependency_libs="$newdependency_libs" -- if test $pass != conv; then -+ if test "$pass" != dlopen; then -+ test "$pass" != scan && dependency_libs="$newdependency_libs" -+ if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do -@@ -2073,7 +2073,7 @@ - deplibs= - fi - done # for pass -- if test $linkmode = prog; then -+ if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi -@@ -2410,7 +2410,7 @@ - ;; - *) - # Add libc to deplibs on all other systems if necessary. -- if test $build_libtool_need_lc = "yes"; then -+ if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; -@@ -2683,7 +2683,7 @@ - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then -- if test $hardcode_into_libs = yes; then -+ if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= |