summaryrefslogtreecommitdiffstats
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:40:06 +0000
commit0cf128ca1b3b2c1c2d250842cd5f02c5f78eef24 (patch)
tree8fdca9d849df2ac855b32c3c8a81cfb6ccbec49f /meta
parent86da1430b7ce05dfbdba2e57954394fdc38600a0 (diff)
downloadpoky-0cf128ca1b3b2c1c2d250842cd5f02c5f78eef24.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) (From OE-Core rev: c78a9246a1aae14a1598d4c801faaf27dd31f66a) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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() {
1572 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1 1572 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1
1573 # but skipping it is still better alternative than providing own 1573 # but skipping it is still better alternative than providing own
1574 # version and then adding runtime dependency for the same system library 1574 # version and then adding runtime dependency for the same system library
1575 if private_libs and n in private_libs: 1575 if private_libs and n[0] in private_libs:
1576 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) 1576 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
1577 continue 1577 continue
1578 if n[0] in shlib_provider.keys(): 1578 if n[0] in shlib_provider.keys():