mirror of
https://git.yoctoproject.org/poky
synced 2026-02-28 12:29:40 +01:00
ff7b415738
Libtool made a release after many years. Update to it, allowing us to drop two backported patches. We also drop a performance optimistion patch since it is too invasive to maintain separately. (From OE-Core rev: b5d13cbdded0f71fd4b847066434d30e8a39c9ce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Subject: [PATCH 04/12] ltmain.sh: Fix sysroot paths being encoded into RPATHs
|
|
|
|
There is a bug where RPATHs could end up containing sysroot values when
|
|
cross compiling which is obviously incorrect. Strip out sysroot components
|
|
from libdir when building RPATH values to avoid this.
|
|
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html]
|
|
|
|
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
|
index 2c994612..96238350 100644
|
|
--- a/build-aux/ltmain.in
|
|
+++ b/build-aux/ltmain.in
|
|
@@ -7654,9 +7654,11 @@ EOF
|
|
test relink = "$opt_mode" || rpath=$compile_rpath$rpath
|
|
for libdir in $rpath; do
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
+ func_replace_sysroot "$libdir"
|
|
+ libdir=$func_replace_sysroot_result
|
|
+ func_stripname '=' '' "$libdir"
|
|
+ libdir=$func_stripname_result
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
- func_replace_sysroot "$libdir"
|
|
- libdir=$func_replace_sysroot_result
|
|
if test -z "$hardcode_libdirs"; then
|
|
hardcode_libdirs=$libdir
|
|
else
|
|
@@ -8386,6 +8388,10 @@ EOF
|
|
hardcode_libdirs=
|
|
for libdir in $compile_rpath $finalize_rpath; do
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
+ func_replace_sysroot "$libdir"
|
|
+ libdir=$func_replace_sysroot_result
|
|
+ func_stripname '=' '' "$libdir"
|
|
+ libdir=$func_stripname_result
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
if test -z "$hardcode_libdirs"; then
|
|
hardcode_libdirs=$libdir
|
|
@@ -8437,6 +8443,10 @@ EOF
|
|
hardcode_libdirs=
|
|
for libdir in $finalize_rpath; do
|
|
if test -n "$hardcode_libdir_flag_spec"; then
|
|
+ func_replace_sysroot "$libdir"
|
|
+ libdir=$func_replace_sysroot_result
|
|
+ func_stripname '=' '' "$libdir"
|
|
+ libdir=$func_stripname_result
|
|
if test -n "$hardcode_libdir_separator"; then
|
|
if test -z "$hardcode_libdirs"; then
|
|
hardcode_libdirs=$libdir
|
|
--
|
|
2.25.1
|
|
|