diff options
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 501004ed48..c9e2aa81ca 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1504,7 +1504,7 @@ python package_do_shlibs() { | |||
1504 | m = re.match("\s+RPATH\s+([^\s]*)", l) | 1504 | m = re.match("\s+RPATH\s+([^\s]*)", l) |
1505 | if m: | 1505 | if m: |
1506 | rpaths = m.group(1).replace("$ORIGIN", ldir).split(":") | 1506 | rpaths = m.group(1).replace("$ORIGIN", ldir).split(":") |
1507 | rpath = map(os.path.normpath, rpaths) | 1507 | rpath = list(map(os.path.normpath, rpaths)) |
1508 | for l in lines: | 1508 | for l in lines: |
1509 | m = re.match("\s+NEEDED\s+([^\s]*)", l) | 1509 | m = re.match("\s+NEEDED\s+([^\s]*)", l) |
1510 | if m: | 1510 | if m: |
@@ -1674,7 +1674,7 @@ python package_do_shlibs() { | |||
1674 | bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) | 1674 | bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) |
1675 | continue | 1675 | continue |
1676 | if n[0] in shlib_provider.keys(): | 1676 | if n[0] in shlib_provider.keys(): |
1677 | shlib_provider_path = list() | 1677 | shlib_provider_path = [] |
1678 | for k in shlib_provider[n[0]].keys(): | 1678 | for k in shlib_provider[n[0]].keys(): |
1679 | shlib_provider_path.append(k) | 1679 | shlib_provider_path.append(k) |
1680 | match = None | 1680 | match = None |