mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 18:32:15 +02:00
80d4ed954a
Whilst this is an alpha release, it makes sense for us to stay close to upstream. We can drop a lot of merged patches which is great to see. During testing, one bug showed up, particularly on mip64 due to an issue with FILECMD being changed to use AC_CHECK_PROG incorredly. A patch has been added for that and sent upstream. (From OE-Core rev: d572297c5810fb248af633014eac96f8ea0a739e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
52 lines
2.1 KiB
Diff
52 lines
2.1 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]
|
|
|
|
Index: libtool-2.5.0/build-aux/ltmain.in
|
|
===================================================================
|
|
--- libtool-2.5.0.orig/build-aux/ltmain.in
|
|
+++ libtool-2.5.0/build-aux/ltmain.in
|
|
@@ -7584,9 +7584,11 @@ func_mode_link ()
|
|
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
|
|
@@ -8316,6 +8318,10 @@ func_mode_link ()
|
|
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
|
|
@@ -8367,6 +8373,10 @@ func_mode_link ()
|
|
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
|