diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2015-03-10 17:56:27 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-16 17:41:56 +0000 |
| commit | 9157c1b0aa5c1bd5dea84c346b4324721d31101d (patch) | |
| tree | 1f4b2c89710af515da8512ee134ba2c18d9adfd9 /meta/classes | |
| parent | 05a69edeb70c3d19d696a2056d50d89a415889cd (diff) | |
| download | poky-9157c1b0aa5c1bd5dea84c346b4324721d31101d.tar.gz | |
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.
(From OE-Core rev: 46ceb4d035e4f49e6b4a3a83bf604944d2b991c1)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/chrpath.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
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): | |||
| 10 | if p.returncode != 0: | 10 | if p.returncode != 0: |
| 11 | return | 11 | return |
| 12 | 12 | ||
| 13 | # Handle RUNPATH as well as RPATH | ||
| 14 | err = err.replace("RUNPATH=","RPATH=") | ||
| 13 | # Throw away everything other than the rpath list | 15 | # Throw away everything other than the rpath list |
| 14 | curr_rpath = err.partition("RPATH=")[2] | 16 | curr_rpath = err.partition("RPATH=")[2] |
| 15 | #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) | 17 | #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) |