aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-03-10 17:56:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:38:35 +0000
commit46ceb4d035e4f49e6b4a3a83bf604944d2b991c1 (patch)
treee6aab2b27381ebbb78272d4dd3372c50f154fc2c
parentb3262af11094f93c9588f2e3edc70a5058491e6d (diff)
downloadopenembedded-core-contrib-46ceb4d035e4f49e6b4a3a83bf604944d2b991c1.tar.gz
openembedded-core-contrib-46ceb4d035e4f49e6b4a3a83bf604944d2b991c1.tar.bz2
openembedded-core-contrib-46ceb4d035e4f49e6b4a3a83bf604944d2b991c1.zip
chrpath.bbclass: handle RUNPATH as well as RPATH
Binaries linked with gold may contain a RUNPATH instead of an RPATH. Update chrpath.bbclass process_file_linux() to handle both cases. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/chrpath.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 77b19372ba0..7a5d9602f52 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -10,6 +10,8 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d):
if p.returncode != 0:
return
+ # Handle RUNPATH as well as RPATH
+ err = err.replace("RUNPATH=","RPATH=")
# Throw away everything other than the rpath list
curr_rpath = err.partition("RPATH=")[2]
#bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip()))