From: Andre McCurdy <armccurdy@gmail.com>
Date: Wed, 11 Mar 2015 00:56:27 +0000 (-0700)
Subject: chrpath.bbclass: handle RUNPATH as well as RPATH
X-Git-Tag: 2015-4~195
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=46ceb4d035e4f49e6b4a3a83bf604944d2b991c1;p=openembedded-core.git

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>
---

diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 77b19372ba..7a5d9602f5 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()))