mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 17:26:36 +01:00
d4e1862453
* Upgrade:
- libtool-native
- libtool-cross
- nativesdk-libtool
- libtool
* Remove 2 patches:
- respect-fstack-protector.patch: already in the new source.
- avoid_absolute_paths_for_general_utils.patch: no general.m4sh any
more.
- Use inline-source to install libtoolize.
* Update other patches
* The LIC_FILES_CHKSUM is changed because of the indent, the contents
are the same.
* The libtool config files are put in libtool/build-aux now, it was
libtool/config in the past.
(From OE-Core rev: 871dc461b1dfc431c0c95743af1624b781262bce)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
51 lines
1.9 KiB
Diff
51 lines
1.9 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>
|
|
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
|
|
Updated by: Robert Yang <liezhi.yang@windriver.com>
|
|
|
|
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
|
--- a/build-aux/ltmain.in
|
|
+++ b/build-aux/ltmain.in
|
|
@@ -7569,9 +7569,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
|
|
@@ -8301,6 +8303,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
|
|
@@ -8352,6 +8358,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
|