diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch index 5c275ffd32..6f9d321eb3 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | |||
| @@ -6,12 +6,13 @@ This works around the issue until it gets sorted out upstream. | |||
| 6 | 6 | ||
| 7 | Fix suggested by Richard Purdie <richard.purdie@intel.com> | 7 | Fix suggested by Richard Purdie <richard.purdie@intel.com> |
| 8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
| 9 | Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> | ||
| 9 | 10 | ||
| 10 | Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | 11 | Index: libtool-2.4.2/libltdl/config/ltmain.m4sh |
| 11 | =================================================================== | 12 | =================================================================== |
| 12 | --- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh | 13 | --- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh |
| 13 | +++ libtool-2.4.2/libltdl/config/ltmain.m4sh | 14 | +++ libtool-2.4.2/libltdl/config/ltmain.m4sh |
| 14 | @@ -7268,9 +7268,11 @@ EOF | 15 | @@ -7268,9 +7268,11 @@ |
| 15 | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | 16 | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" |
| 16 | for libdir in $rpath; do | 17 | for libdir in $rpath; do |
| 17 | if test -n "$hardcode_libdir_flag_spec"; then | 18 | if test -n "$hardcode_libdir_flag_spec"; then |
| @@ -25,7 +26,7 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | |||
| 25 | if test -z "$hardcode_libdirs"; then | 26 | if test -z "$hardcode_libdirs"; then |
| 26 | hardcode_libdirs="$libdir" | 27 | hardcode_libdirs="$libdir" |
| 27 | else | 28 | else |
| 28 | @@ -7999,6 +8001,10 @@ EOF | 29 | @@ -7999,6 +8001,10 @@ |
| 29 | hardcode_libdirs= | 30 | hardcode_libdirs= |
| 30 | for libdir in $compile_rpath $finalize_rpath; do | 31 | for libdir in $compile_rpath $finalize_rpath; do |
| 31 | if test -n "$hardcode_libdir_flag_spec"; then | 32 | if test -n "$hardcode_libdir_flag_spec"; then |
| @@ -36,3 +37,14 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | |||
| 36 | if test -n "$hardcode_libdir_separator"; then | 37 | if test -n "$hardcode_libdir_separator"; then |
| 37 | if test -z "$hardcode_libdirs"; then | 38 | if test -z "$hardcode_libdirs"; then |
| 38 | hardcode_libdirs="$libdir" | 39 | hardcode_libdirs="$libdir" |
| 40 | @@ -8050,6 +8056,10 @@ | ||
| 41 | hardcode_libdirs= | ||
| 42 | for libdir in $finalize_rpath; do | ||
| 43 | if test -n "$hardcode_libdir_flag_spec"; then | ||
| 44 | + func_replace_sysroot "$libdir" | ||
| 45 | + libdir=$func_replace_sysroot_result | ||
| 46 | + func_stripname '=' '' "$libdir" | ||
| 47 | + libdir=$func_stripname_result | ||
| 48 | if test -n "$hardcode_libdir_separator"; then | ||
| 49 | if test -z "$hardcode_libdirs"; then | ||
| 50 | hardcode_libdirs="$libdir" | ||