mirror of
https://git.yoctoproject.org/poky
synced 2026-02-09 18:23:02 +01:00
d8bee043cb
Rebased patches to the newer source code and deleted resolve-sysroot.patch
since its already applied upstream
merged libtool-2.4.2.inc & libtool.inc files
replaced PR with ${INC_PR}.0
(From OE-Core rev: aa0cb889a4ef883235dc3f3e1d76ee4a556ae03a)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Enalbing sysroot support exposed a bug where the final library
|
|
had an RPATH encoded into it which still pointed to the sysroot.
|
|
This works around the issue until it gets sorted out upstream.
|
|
|
|
Fix suggested by Richard Purdie <richard.purdie@intel.com>
|
|
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
|
|
|
Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
|
|
===================================================================
|
|
--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
|
|
+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
|
|
@@ -7268,9 +7268,11 @@ EOF
|
|
test "$opt_mode" != relink && 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
|
|
@@ -7999,6 +8001,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"
|