summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-01-08 18:11:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-11 17:39:49 +0000
commitc78a9246a1aae14a1598d4c801faaf27dd31f66a (patch)
tree4e700811f8e175fda3461ea9f19a5b939201062e /meta
parent0e4f0f893de2c0fac444b779b2b3028fd79e6048 (diff)
downloadopenembedded-core-c78a9246a1aae14a1598d4c801faaf27dd31f66a.tar.gz
openembedded-core-c78a9246a1aae14a1598d4c801faaf27dd31f66a.tar.bz2
openembedded-core-c78a9246a1aae14a1598d4c801faaf27dd31f66a.zip
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> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 96d7fd9b26..4685cd2bc0 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1572,7 +1572,7 @@ python package_do_shlibs() {
# /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1
# but skipping it is still better alternative than providing own
# version and then adding runtime dependency for the same system library
- if private_libs and n in private_libs:
+ if private_libs and n[0] in private_libs:
bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
continue
if n[0] in shlib_provider.keys():