From 14aeaa71fdbc23b8004b1c2ba9c4daf325b1ae96 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 13 May 2016 14:10:01 -0400
Subject: eclass: ELT-patches: update cross patches for libtool-2.4+ #572038

---
 eclass/ELT-patches/cross/2.2       | 20 ++++++++++++++++++++
 eclass/ELT-patches/cross/2.4       | 20 ++++++++++++++++++++
 eclass/ELT-patches/cross/2.4.3     | 21 +++++++++++++++++++++
 eclass/ELT-patches/cross/link-ROOT | 20 --------------------
 4 files changed, 61 insertions(+), 20 deletions(-)
 create mode 100644 eclass/ELT-patches/cross/2.2
 create mode 100644 eclass/ELT-patches/cross/2.4
 create mode 100644 eclass/ELT-patches/cross/2.4.3
 delete mode 100644 eclass/ELT-patches/cross/link-ROOT

(limited to 'eclass/ELT-patches')

diff --git a/eclass/ELT-patches/cross/2.2 b/eclass/ELT-patches/cross/2.2
new file mode 100644
index 000000000000..e8fc2be5210a
--- /dev/null
+++ b/eclass/ELT-patches/cross/2.2
@@ -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${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${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
index 000000000000..9b3529559179
--- /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
index 000000000000..760104fc894e
--- /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
+
diff --git a/eclass/ELT-patches/cross/link-ROOT b/eclass/ELT-patches/cross/link-ROOT
deleted file mode 100644
index 3c7d99be1f20..000000000000
--- a/eclass/ELT-patches/cross/link-ROOT
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
-@@ -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="-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$ROOT/$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
- 		case $libdir in
-- 
cgit v1.2.3-65-gdbad