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 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch index 6f9d321eb3..5c9f8cc9c0 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | |||
@@ -7,13 +7,13 @@ This works around the issue until it gets sorted out upstream. | |||
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 | Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> |
10 | Updated by: Robert Yang <liezhi.yang@windriver.com> | ||
10 | 11 | ||
11 | Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | 12 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
12 | =================================================================== | 13 | --- a/build-aux/ltmain.in |
13 | --- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh | 14 | +++ b/build-aux/ltmain.in |
14 | +++ libtool-2.4.2/libltdl/config/ltmain.m4sh | 15 | @@ -7569,9 +7569,11 @@ EOF |
15 | @@ -7268,9 +7268,11 @@ | 16 | test relink = "$opt_mode" || rpath=$compile_rpath$rpath |
16 | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | ||
17 | for libdir in $rpath; do | 17 | for libdir in $rpath; do |
18 | if test -n "$hardcode_libdir_flag_spec"; then | 18 | if test -n "$hardcode_libdir_flag_spec"; then |
19 | + func_replace_sysroot "$libdir" | 19 | + func_replace_sysroot "$libdir" |
@@ -24,9 +24,9 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | |||
24 | - func_replace_sysroot "$libdir" | 24 | - func_replace_sysroot "$libdir" |
25 | - libdir=$func_replace_sysroot_result | 25 | - libdir=$func_replace_sysroot_result |
26 | if test -z "$hardcode_libdirs"; then | 26 | if test -z "$hardcode_libdirs"; then |
27 | hardcode_libdirs="$libdir" | 27 | hardcode_libdirs=$libdir |
28 | else | 28 | else |
29 | @@ -7999,6 +8001,10 @@ | 29 | @@ -8301,6 +8303,10 @@ EOF |
30 | hardcode_libdirs= | 30 | hardcode_libdirs= |
31 | for libdir in $compile_rpath $finalize_rpath; do | 31 | for libdir in $compile_rpath $finalize_rpath; do |
32 | if test -n "$hardcode_libdir_flag_spec"; then | 32 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -36,8 +36,8 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | |||
36 | + libdir=$func_stripname_result | 36 | + libdir=$func_stripname_result |
37 | if test -n "$hardcode_libdir_separator"; then | 37 | if test -n "$hardcode_libdir_separator"; then |
38 | if test -z "$hardcode_libdirs"; then | 38 | if test -z "$hardcode_libdirs"; then |
39 | hardcode_libdirs="$libdir" | 39 | hardcode_libdirs=$libdir |
40 | @@ -8050,6 +8056,10 @@ | 40 | @@ -8352,6 +8358,10 @@ EOF |
41 | hardcode_libdirs= | 41 | hardcode_libdirs= |
42 | for libdir in $finalize_rpath; do | 42 | for libdir in $finalize_rpath; do |
43 | if test -n "$hardcode_libdir_flag_spec"; then | 43 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -47,4 +47,4 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh | |||
47 | + libdir=$func_stripname_result | 47 | + libdir=$func_stripname_result |
48 | if test -n "$hardcode_libdir_separator"; then | 48 | if test -n "$hardcode_libdir_separator"; then |
49 | if test -z "$hardcode_libdirs"; then | 49 | if test -z "$hardcode_libdirs"; then |
50 | hardcode_libdirs="$libdir" | 50 | hardcode_libdirs=$libdir |