| 1 |
vapier 08/04/20 12:33:10 |
| 2 |
|
| 3 |
Added: 2.2 |
| 4 |
Log: |
| 5 |
update patch for libtool-2.2 #212718 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1 eclass/ELT-patches/portage/2.2 |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/portage/2.2?rev=1.1&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ELT-patches/portage/2.2?rev=1.1&content-type=text/plain |
| 12 |
|
| 13 |
Index: 2.2 |
| 14 |
=================================================================== |
| 15 |
--- ltmain.sh |
| 16 |
+++ ltmain.sh |
| 17 |
@@ -7410,9 +7410,53 @@ |
| 18 |
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 19 |
test -z "$libdir" && \ |
| 20 |
func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 21 |
- newdependency_libs="$newdependency_libs $libdir/$name" |
| 22 |
+ if test "x$EGREP" = x ; then |
| 23 |
+ EGREP=egrep |
| 24 |
+ fi |
| 25 |
+ # We do not want portage's install root ($D) present. Check only for |
| 26 |
+ # this if the .la is being installed. |
| 27 |
+ if test "$installed" = yes && test "$D"; then |
| 28 |
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 29 |
+ else |
| 30 |
+ mynewdependency_lib="$libdir/$name" |
| 31 |
+ fi |
| 32 |
+ # Do not add duplicates |
| 33 |
+ if test "$mynewdependency_lib"; then |
| 34 |
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 35 |
+ if test -z "$my_little_ninja_foo_1"; then |
| 36 |
+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 37 |
+ fi |
| 38 |
+ fi |
| 39 |
+ ;; |
| 40 |
+ *) |
| 41 |
+ if test "$installed" = yes; then |
| 42 |
+ # Rather use S=WORKDIR if our version of portage supports it. |
| 43 |
+ # This is because some ebuild (gcc) do not use $S as buildroot. |
| 44 |
+ if test "$PWORKDIR"; then |
| 45 |
+ S="$PWORKDIR" |
| 46 |
+ fi |
| 47 |
+ # We do not want portage's build root ($S) present. |
| 48 |
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
| 49 |
+ # We do not want portage's install root ($D) present. |
| 50 |
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
| 51 |
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
| 52 |
+ mynewdependency_lib="" |
| 53 |
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
| 54 |
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 55 |
+ else |
| 56 |
+ mynewdependency_lib="$deplib" |
| 57 |
+ fi |
| 58 |
+ else |
| 59 |
+ mynewdependency_lib="$deplib" |
| 60 |
+ fi |
| 61 |
+ # Do not add duplicates |
| 62 |
+ if test "$mynewdependency_lib"; then |
| 63 |
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
| 64 |
+ if test -z "$my_little_ninja_foo_4"; then |
| 65 |
+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
| 66 |
+ fi |
| 67 |
+ fi |
| 68 |
;; |
| 69 |
- *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 70 |
esac |
| 71 |
done |
| 72 |
dependency_libs="$newdependency_libs" |
| 73 |
@@ -7476,6 +7520,10 @@ |
| 74 |
case $host,$output,$installed,$module,$dlname in |
| 75 |
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
| 76 |
esac |
| 77 |
+ # Do not add duplicates |
| 78 |
+ if test "$installed" = yes && test "$D"; then |
| 79 |
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
| 80 |
+ fi |
| 81 |
$ECHO > $output "\ |
| 82 |
# $outputname - a libtool library file |
| 83 |
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
-- |
| 88 |
gentoo-commits@l.g.o mailing list |
Archives