[gentoo-commits] repo/gentoo:master commit in: eclass/ELT-patches/cross/

[gentoo-commits] repo/gentoo:master commit in: eclass/ELT-patches/cross/

[Mike Frysinger]

commit:     14aeaa71fdbc23b8004b1c2ba9c4daf325b1ae96
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 18:10:01 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri May 13 18:13:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14aeaa71

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

 eclass/ELT-patches/cross/{link-ROOT => 2.2} |  8 ++++----
 eclass/ELT-patches/cross/{link-ROOT => 2.4} |  8 ++++----
 eclass/ELT-patches/cross/2.4.3              | 21 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/eclass/ELT-patches/cross/link-ROOT b/eclass/ELT-patches/cross/2.2
similarity index 73%
copy from eclass/ELT-patches/cross/link-ROOT
copy to eclass/ELT-patches/cross/2.2
index 3c7d99b..e8fc2be 100644
--- 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/link-ROOT b/eclass/ELT-patches/cross/2.4
similarity index 73%
rename from eclass/ELT-patches/cross/link-ROOT
rename to eclass/ELT-patches/cross/2.4
index 3c7d99b..9b35295 100644
--- a/eclass/ELT-patches/cross/link-ROOT
+++ b/eclass/ELT-patches/cross/2.4
@@ -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${lt_sysroot:-${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${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
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
+