diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch')
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch new file mode 100644 index 0000000000..5c275ffd32 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Enalbing sysroot support exposed a bug where the final library | ||
| 4 | had an RPATH encoded into it which still pointed to the sysroot. | ||
| 5 | This works around the issue until it gets sorted out upstream. | ||
| 6 | |||
| 7 | Fix suggested by Richard Purdie <richard.purdie@intel.com> | ||
| 8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
| 9 | |||
| 10 | Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | ||
| 11 | =================================================================== | ||
| 12 | --- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh | ||
| 13 | +++ libtool-2.4.2/libltdl/config/ltmain.m4sh | ||
| 14 | @@ -7268,9 +7268,11 @@ EOF | ||
| 15 | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | ||
| 16 | for libdir in $rpath; do | ||
| 17 | if test -n "$hardcode_libdir_flag_spec"; then | ||
| 18 | + func_replace_sysroot "$libdir" | ||
| 19 | + libdir=$func_replace_sysroot_result | ||
| 20 | + func_stripname '=' '' "$libdir" | ||
| 21 | + libdir=$func_stripname_result | ||
| 22 | if test -n "$hardcode_libdir_separator"; then | ||
| 23 | - func_replace_sysroot "$libdir" | ||
| 24 | - libdir=$func_replace_sysroot_result | ||
| 25 | if test -z "$hardcode_libdirs"; then | ||
| 26 | hardcode_libdirs="$libdir" | ||
| 27 | else | ||
| 28 | @@ -7999,6 +8001,10 @@ EOF | ||
| 29 | hardcode_libdirs= | ||
| 30 | for libdir in $compile_rpath $finalize_rpath; do | ||
| 31 | if test -n "$hardcode_libdir_flag_spec"; then | ||
| 32 | + func_replace_sysroot "$libdir" | ||
| 33 | + libdir=$func_replace_sysroot_result | ||
| 34 | + func_stripname '=' '' "$libdir" | ||
| 35 | + libdir=$func_stripname_result | ||
| 36 | if test -n "$hardcode_libdir_separator"; then | ||
| 37 | if test -z "$hardcode_libdirs"; then | ||
| 38 | hardcode_libdirs="$libdir" | ||