summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2014-10-17 10:41:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 17:36:14 +0100
commit7a206eb3bfdbd1923e381dae669835e40fbe1819 (patch)
tree1ec1febc424f0b0b4066aa4c1af57b8456491f7f /meta/recipes-devtools
parent12769d73ffcbd4e2b38d070f8dd6ed315cda5be4 (diff)
downloadpoky-7a206eb3bfdbd1923e381dae669835e40fbe1819.tar.gz
libtool: Extend fix-final-rpath.patch
When building upower from meta-oe, the following QA error occurred: ERROR: QA Issue: package upower contains bad RPATH It appears to have been caused by one of the cases fix-final-rpath.patch is meant to address but missed. So this change fixes the additional case that was causing upower to have the QA error. (From OE-Core rev: d2b2bb7cedb678c9f67ef1d9170fc427d9beee1e) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch16
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
7Fix suggested by Richard Purdie <richard.purdie@intel.com> 7Fix suggested by Richard Purdie <richard.purdie@intel.com>
8Signed-off-by: Scott Garman <scott.a.garman@intel.com> 8Signed-off-by: Scott Garman <scott.a.garman@intel.com>
9Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
9 10
10Index: libtool-2.4.2/libltdl/config/ltmain.m4sh 11Index: 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"