diff options
| author |   Joakim Tjernlund <joakim.tjernlund@infinera.com> | 2024-11-13 20:44:21 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-11-15 04:10:53 +0000 |
| commit | 7fddd3d2740e1fa8e73da716039ca8bd01ce9457 (patch) | |
| tree | f8bc0940844c134b8b036a8419e4aebd58760869 | |
| parent | eltpatch.in: fix some indentation nits (diff) | |
| download | elt-patches-7fddd3d2740e1fa8e73da716039ca8bd01ce9457.tar.gz elt-patches-7fddd3d2740e1fa8e73da716039ca8bd01ce9457.tar.bz2 elt-patches-7fddd3d2740e1fa8e73da716039ca8bd01ce9457.zip | |
patches: cross: cross 2.5 for libtool-2.5.x
Bug: https://bugs.gentoo.org/572038
Bug: https://bugs.gentoo.org/943158
Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Closes: https://github.com/gentoo/elt-patches/pull/4
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | patches/cross/2.5 | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/cross/2.5 b/patches/cross/2.5 new file mode 100644 index 0000000..ecbda5f --- /dev/null +++ b/patches/cross/2.5 @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/572038 +https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=3221f9f0fb98d5740ab5d0e8db6a731302520644 +https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=b8cad780da77b7cf3aae1b660be3298b7fc48d1e +https://lists.gnu.org/archive/html/libtool/2024-05/msg00018.html +--- ltmain.sh 2024-11-13 20:08:41.912939429 +0100 ++++ ltmain.sh 2024-11-13 20:10:56.080438810 +0100 +@@ -8682,7 +8682,7 @@ + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then +- add_dir=-L$lt_sysroot$libdir ++ add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + case :$finalize_shlibpath: in +@@ -8699,7 +8699,7 @@ + fi + else + # We cannot seem to hardcode it, guess we'll fake it. +- add_dir=-L$lt_sysroot$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 |