diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2015-01-08 18:11:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:08:20 +0000 |
commit | 013de192d746809e397b1c6de22bddf9ed34185f (patch) | |
tree | 96ead29895496e6ab837035f989b5e9f8a89b364 /meta/classes/package.bbclass | |
parent | 311d9d1e9f31544104b4c514c70999d03711ffb6 (diff) | |
download | poky-013de192d746809e397b1c6de22bddf9ed34185f.tar.gz |
package.bbclass: Fix support for private libs
* n is a tuple since this commit:
commit d3aa7668a9f001044d0a0f1ba2de425a36056102
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon Jul 7 18:41:23 2014 +0100
Subject package.bbclass: Improve shlibs needed data structure
since then 'n in private_libs' was always false and private libs
were always processed
* this is bad when we have libfoo in private libs, but also some package
providing libfoo, that way we ship own libfoo.so, but together with
runtime dependency on package providing libfoo
(From OE-Core rev: ec1d379683cedca4be1c252475d02c8041227142)
Signed-off-by: Martin Jansa <Martin.Jansa@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/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index fc501fcdea..31c9e080ed 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1574,7 +1574,7 @@ python package_do_shlibs() { | |||
1574 | # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1 | 1574 | # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1 |
1575 | # but skipping it is still better alternative than providing own | 1575 | # but skipping it is still better alternative than providing own |
1576 | # version and then adding runtime dependency for the same system library | 1576 | # version and then adding runtime dependency for the same system library |
1577 | if private_libs and n in private_libs: | 1577 | if private_libs and n[0] in private_libs: |
1578 | bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) | 1578 | bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) |
1579 | continue | 1579 | continue |
1580 | if n[0] in shlib_provider.keys(): | 1580 | if n[0] in shlib_provider.keys(): |