diff options
-rw-r--r-- | meta/classes/chrpath.bbclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index cdd7f27600..72e8a122e3 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass | |||
@@ -5,17 +5,17 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
5 | import subprocess as sub | 5 | import subprocess as sub |
6 | 6 | ||
7 | p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 7 | p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
8 | err, out = p.communicate() | 8 | out, err = p.communicate() |
9 | # If returned successfully, process stderr for results | 9 | # If returned successfully, process stdout for results |
10 | if p.returncode != 0: | 10 | if p.returncode != 0: |
11 | return | 11 | return |
12 | 12 | ||
13 | err = err.decode('utf-8') | 13 | out = out.decode('utf-8') |
14 | 14 | ||
15 | # Handle RUNPATH as well as RPATH | 15 | # Handle RUNPATH as well as RPATH |
16 | err = err.replace("RUNPATH=","RPATH=") | 16 | out = out.replace("RUNPATH=","RPATH=") |
17 | # Throw away everything other than the rpath list | 17 | # Throw away everything other than the rpath list |
18 | curr_rpath = err.partition("RPATH=")[2] | 18 | curr_rpath = out.partition("RPATH=")[2] |
19 | #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) | 19 | #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip())) |
20 | rpaths = curr_rpath.split(":") | 20 | rpaths = curr_rpath.split(":") |
21 | new_rpaths = [] | 21 | new_rpaths = [] |
@@ -46,11 +46,11 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
46 | import subprocess as sub | 46 | import subprocess as sub |
47 | 47 | ||
48 | p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 48 | p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
49 | err, out = p.communicate() | 49 | out, err = p.communicate() |
50 | # If returned successfully, process stderr for results | 50 | # If returned successfully, process stdout for results |
51 | if p.returncode != 0: | 51 | if p.returncode != 0: |
52 | return | 52 | return |
53 | for l in err.split("\n"): | 53 | for l in out.split("\n"): |
54 | if "(compatibility" not in l: | 54 | if "(compatibility" not in l: |
55 | continue | 55 | continue |
56 | rpath = l.partition("(compatibility")[0].strip() | 56 | rpath = l.partition("(compatibility")[0].strip() |
@@ -59,7 +59,7 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
59 | 59 | ||
60 | newpath = "@loader_path/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/"))) | 60 | newpath = "@loader_path/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/"))) |
61 | p = sub.Popen([d.expand("${HOST_PREFIX}install_name_tool"), '-change', rpath, newpath, fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 61 | p = sub.Popen([d.expand("${HOST_PREFIX}install_name_tool"), '-change', rpath, newpath, fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
62 | err, out = p.communicate() | 62 | out, err = p.communicate() |
63 | 63 | ||
64 | def process_dir (rootdir, directory, d): | 64 | def process_dir (rootdir, directory, d): |
65 | import stat | 65 | import stat |