eclass: ELT-patches: update cross patches for libtool-2.4+ #572038

diff --git a/eclass/ELT-patches/cross/link-ROOT b/eclass/ELT-patches/cross/2.2
similarity index 73%
rename from eclass/ELT-patches/cross/link-ROOT
rename to eclass/ELT-patches/cross/2.2
index 3c7d99be1f20f9041c3dc19fb505fe0e48828563..e8fc2be5210a110ce04dd9ec892f9b056a2131b0 100644 (file)
--- a/eclass/ELT-patches/cross/link-ROOT
+++ b/eclass/ELT-patches/cross/2.2
@@ -1,11 +1,11 @@
---- libltdl/config/ltmain.sh   2008-09-07 19:56:33.000000000 +0200
-+++ libltdl/config/ltmain.sh.new       2009-02-15 20:37:47.000000000 +0100
+--- ltmain.sh
++++ ltmain.sh
 @@ -5768,7 +5768,7 @@
               test "$hardcode_direct_absolute" = no; then
              add="$libdir/$linklib"
            elif test "$hardcode_minus_L" = yes; then
 -            add_dir="-L$libdir"
-+            add_dir="-L$ROOT/$libdir"
++            add_dir="-L${SYSROOT}$libdir"
              add="-l$name"
            elif test "$hardcode_shlibpath_var" = yes; then
              case :$finalize_shlibpath: in
@@ -14,7 +14,7 @@
            else
              # We cannot seem to hardcode it, guess we'll fake it.
 -            add_dir="-L$libdir"
-+            add_dir="-L$ROOT/$libdir"
++            add_dir="-L${SYSROOT}/$libdir"
              # Try looking first in the location we're being installed to.
              if test -n "$inst_prefix_dir"; then
                case $libdir in

diff --git a/eclass/ELT-patches/cross/2.4 b/eclass/ELT-patches/cross/2.4
new file mode 100644 (file)
index 0000000..9b35295
--- /dev/null
+++ b/eclass/ELT-patches/cross/2.4
@@ -0,0 +1,20 @@
+--- ltmain.sh
++++ ltmain.sh
+@@ -5768,7 +5768,7 @@
+              test "$hardcode_direct_absolute" = no; then
+             add="$libdir/$linklib"
+           elif test "$hardcode_minus_L" = yes; then
+-            add_dir="-L$libdir"
++            add_dir="-L${lt_sysroot:-${SYSROOT}}$libdir"
+             add="-l$name"
+           elif test "$hardcode_shlibpath_var" = yes; then
+             case :$finalize_shlibpath: in
+@@ -5785,7 +5785,7 @@
+             fi
+           else
+             # We cannot seem to hardcode it, guess we'll fake it.
+-            add_dir="-L$libdir"
++            add_dir="-L${lt_sysroot:-${SYSROOT}}/$libdir"
+             # Try looking first in the location we're being installed to.
+             if test -n "$inst_prefix_dir"; then
+               case $libdir in

diff --git a/eclass/ELT-patches/cross/2.4.3 b/eclass/ELT-patches/cross/2.4.3
new file mode 100644 (file)
index 0000000..760104f
--- /dev/null
+++ b/eclass/ELT-patches/cross/2.4.3
@@ -0,0 +1,21 @@
+--- ltmain.sh
++++ ltmain.sh
+@@ -8367,7 +8367,7 @@
+              test no = "$hardcode_direct_absolute"; then
+             add=$libdir/$linklib
+           elif test yes = "$hardcode_minus_L"; then
+-            add_dir=-L$libdir
++            add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir
+             add=-l$name
+           elif test yes = "$hardcode_shlibpath_var"; then
+             case :$finalize_shlibpath: in
+@@ -8384,7 +8384,7 @@
+             fi
+           else
+             # We cannot seem to hardcode it, guess we'll fake it.
+-            add_dir=-L$libdir
++            add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir
+             # Try looking first in the location we're being installed to.
+             if test -n "$inst_prefix_dir"; then
+               case $libdir in
+