From 46ceb4d035e4f49e6b4a3a83bf604944d2b991c1 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Mar 2015 17:56:27 -0700 Subject: 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 Signed-off-by: Ross Burton --- meta/classes/chrpath.bbclass | 2 ++ 1 file changed, 2 insertions(+) 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())) -- cgit 1.2.3-korg