diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-05-13 14:10:01 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-05-13 14:13:15 -0400 |
| commit | 14aeaa71fdbc23b8004b1c2ba9c4daf325b1ae96 (patch) | |
| tree | 3ab8d60d14c967ae13b426efe6ce2c39380baa0c /eclass | |
| parent | sys-apps/openrc: Install supervise-daemon pam file (diff) | |
| download | gentoo-14aeaa71fdbc23b8004b1c2ba9c4daf325b1ae96.tar.gz gentoo-14aeaa71fdbc23b8004b1c2ba9c4daf325b1ae96.tar.bz2 gentoo-14aeaa71fdbc23b8004b1c2ba9c4daf325b1ae96.zip | |
eclass: ELT-patches: update cross patches for libtool-2.4+ #572038
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ELT-patches/cross/2.2 (renamed from eclass/ELT-patches/cross/link-ROOT) | 8 | ||||
| -rw-r--r-- | eclass/ELT-patches/cross/2.4 | 20 | ||||
| -rw-r--r-- | eclass/ELT-patches/cross/2.4.3 | 21 |
3 files changed, 45 insertions, 4 deletions
diff --git a/eclass/ELT-patches/cross/link-ROOT b/eclass/ELT-patches/cross/2.2 index 3c7d99be1f20..e8fc2be5210a 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/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 + |