mirror of
https://git.yoctoproject.org/poky
synced 2026-02-22 01:19:41 +01:00
ded899b580
Enabling 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@linuxfoundation.org> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
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/libltdl/config/ltmain.m4sh
|
|
===================================================================
|
|
--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-01-13 14:10:14.580025108 +0000
|
|
+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-01-13 15:10:18.540025113 +0000
|
|
@@ -7246,9 +7246,11 @@
|
|
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
|
|
@@ -7981,6 +7983,10 @@
|
|
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"
|