[patch] For elibtoolize calls, base libraries at sysroot, and remove sysroot from rpaths

portage-libtool.patch (text/plain), 3.97 KB, created by popham on 2016-01-27 02:13:55 UTC

diff -ruN a/eclass/ELT-patches/cross/link-ROOT b/eclass/ELT-patches/cross/link-ROOT
--- a/eclass/ELT-patches/cross/link-ROOT	2015-08-09 20:34:51.000000000 +0000
+++ b/eclass/ELT-patches/cross/link-ROOT	1970-01-01 00:00:00.000000000 +0000
@@ -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
diff -ruN a/eclass/ELT-patches/cross/link-ROOT-2.4.2 b/eclass/ELT-patches/cross/link-ROOT-2.4.2
--- a/eclass/ELT-patches/cross/link-ROOT-2.4.2	1970-01-01 00:00:00.000000000 +0000
+++ b/eclass/ELT-patches/cross/link-ROOT-2.4.2	2016-01-26 20:35:08.604635872 +0000
@@ -0,0 +1,33 @@
+--- ltmain.sh   2011-10-17 03:19:35.000000000 -0700
++++ ltmain.sh.new       2016-01-26 12:24:48.668164073 -0800
+@@ -6901,7 +6901,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$libdir"
+              add="-l$name"
+            elif test "$hardcode_shlibpath_var" = yes; then
+              case :$finalize_shlibpath: in
+@@ -6918,7 +6918,7 @@
+              fi
+            else
+              # We cannot seem to hardcode it, guess we'll fake it.
+-             add_dir="-L$libdir"
++             add_dir="-L$lt_sysroot$libdir"
+              # Try looking first in the location we're being installed to.
+              if test -n "$inst_prefix_dir"; then
+                case $libdir in
+@@ -8064,7 +8064,12 @@
+                  esac
+                fi
+              else
++               local sysrooted_libdir
++               sysrooted_libdir=$libdir
++               func_stripname "$lt_sysroot" '' "$libdir"
++               libdir=$func_stripname_result
+                eval flag=\"$hardcode_libdir_flag_spec\"
++               libdir=sysrooted_libdir
+                func_append dep_rpath " $flag"
+              fi
+            elif test -n "$runpath_var"; then
diff -ruN a/eclass/ELT-patches/cross/link-ROOT-2.4.4 b/eclass/ELT-patches/cross/link-ROOT-2.4.4
--- a/eclass/ELT-patches/cross/link-ROOT-2.4.4	1970-01-01 00:00:00.000000000 +0000
+++ b/eclass/ELT-patches/cross/link-ROOT-2.4.4	2016-01-26 20:29:01.828032288 +0000
@@ -0,0 +1,33 @@
+--- ltmain.sh	2016-01-25 10:03:55.914625270 +0000
++++ ltmain.sh.new	2016-01-26 09:44:01.434783649 +0000
+@@ -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$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$libdir
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in
+@@ -9579,7 +9579,11 @@
+ 		  esac
+ 		fi
+ 	      else
++		local sysrooted_libdir
++		sysrooted_libdir=$libdir
++		func_stripname "$lt_sysroot" '' "$libdir"
++		libdir=$func_stripname_result
+ 		eval flag=\"$hardcode_libdir_flag_spec\"
++		libdir=sysrooted_libdir
+ 		func_append dep_rpath " $flag"
+ 	      fi
+ 	    elif test -n "$runpath_var"; then