[oe-commits] Andre McCurdy : chrpath.bbclass: handle RUNPATH as well as RPATH

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 46ceb4d035e4f49e6b4a3a83bf604944d2b991c1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=46ceb4d035e4f49e6b4a3a83bf604944d2b991c1

Author: Andre McCurdy <armccurdy at gmail.com>
Date:   Tue Mar 10 17:56:27 2015 -0700

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 at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/chrpath.bbclass | 2 ++
 1 file changed, 2 insertions(+)

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