diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package.bbclass | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index df5206bda9..be76b30f31 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1575,7 +1575,7 @@ SHLIBSWORKDIR = "${PKGDESTWORK}/${MLPREFIX}shlibs2"  python package_do_shlibs() {      import re, pipes -    import subprocess as sub +    import subprocess      exclude_shlibs = d.getVar('EXCLUDE_FROM_SHLIBS', False)      if exclude_shlibs: @@ -1677,7 +1677,7 @@ python package_do_shlibs() {                      sonames.add(prov)          if file.endswith('.dylib') or file.endswith('.so'):              rpath = [] -            p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-l', file],stdout=sub.PIPE,stderr=sub.PIPE) +            p = subprocess.Popen([d.expand("${HOST_PREFIX}otool"), '-l', file], stdout=subprocess.PIPE, stderr=subprocess.PIPE)              out, err = p.communicate()              # If returned successfully, process stdout for results              if p.returncode == 0: @@ -1686,7 +1686,7 @@ python package_do_shlibs() {                      if l.startswith('path '):                          rpath.append(l.split()[1]) -        p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', file],stdout=sub.PIPE,stderr=sub.PIPE) +        p = subprocess.Popen([d.expand("${HOST_PREFIX}otool"), '-L', file], stdout=subprocess.PIPE, stderr=subprocess.PIPE)          out, err = p.communicate()          # If returned successfully, process stdout for results          if p.returncode == 0: @@ -1710,7 +1710,7 @@ python package_do_shlibs() {          if (file.endswith(".dll") or file.endswith(".exe")):              # use objdump to search for "DLL Name: .*\.dll" -            p = sub.Popen([d.expand("${HOST_PREFIX}objdump"), "-p", file], stdout = sub.PIPE, stderr= sub.PIPE) +            p = subprocess.Popen([d.expand("${HOST_PREFIX}objdump"), "-p", file], stdout=subprocess.PIPE, stderr=subprocess.PIPE)              out, err = p.communicate()              # process the output, grabbing all .dll names              if p.returncode == 0: | 
