| 1 |
Dear developers |
| 2 |
I would like to propose the following patch to |
| 3 |
eclass/ELT-patches/cross/2.4.3 |
| 4 |
|
| 5 |
Cross linking in dev-scheme/guile-1.8.8-r2 and net-libs/gnutls-3.4.14 |
| 6 |
fails (see https://bugs.gentoo.org/show_bug.cgi?id=590404). |
| 7 |
|
| 8 |
Best regards |
| 9 |
Gerhard Bräunlich |
| 10 |
|
| 11 |
--- ltmain.sh |
| 12 |
+++ ltmain.sh |
| 13 |
-@@ -8367,7 +8367,7 @@ |
| 14 |
+@@ -7955,13 +7955,13 @@ |
| 15 |
+ |
| 16 |
+ # Find the relevant object directory and library name. |
| 17 |
+ if test yes = "$installed"; then |
| 18 |
+- if test ! -f "$lt_sysroot$libdir/$linklib" && test -f |
| 19 |
"$abs_ladir/$linklib"; then |
| 20 |
++ if test ! -f "${lt_sysroot:-${SYSROOT}}$libdir/$linklib" && test -f |
| 21 |
"$abs_ladir/$linklib"; then |
| 22 |
+ func_warning "library '$lib' was moved." |
| 23 |
+ dir=$ladir |
| 24 |
+ absdir=$abs_ladir |
| 25 |
+ libdir=$abs_ladir |
| 26 |
+ else |
| 27 |
+- dir=$lt_sysroot$libdir |
| 28 |
++ dir=${lt_sysroot:-${SYSROOT}}$libdir |
| 29 |
+ absdir=$lt_sysroot$libdir |
| 30 |
+ fi |
| 31 |
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes |
| 32 |
+@@ -8344,7 +8344,7 @@ |
| 33 |
test no = "$hardcode_direct_absolute"; then |
| 34 |
add=$libdir/$linklib |
| 35 |
elif test yes = "$hardcode_minus_L"; then |
| 36 |
@@ -9,7 +25,7 @@ |
| 37 |
add=-l$name |
| 38 |
elif test yes = "$hardcode_shlibpath_var"; then |
| 39 |
case :$finalize_shlibpath: in |
| 40 |
-@@ -8384,7 +8384,7 @@ |
| 41 |
+@@ -8361,7 +8361,7 @@ |
| 42 |
fi |
| 43 |
else |
| 44 |
# We cannot seem to hardcode it, guess we'll fake it. |
| 45 |
@@ -18,4 +34,3 @@ |
| 46 |
# Try looking first in the location we're being installed to. |
| 47 |
if test -n "$inst_prefix_dir"; then |
| 48 |
case $libdir in |
| 49 |
- |
Archives