[oe-commits] Martin Jansa : package.bbclass: Fix support for private libs

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ec1d379683cedca4be1c252475d02c8041227142
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ec1d379683cedca4be1c252475d02c8041227142

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Thu Jan  8 18:11:18 2015 +0100

package.bbclass: Fix support for private libs

* n is a tuple since this commit:
  commit d3aa7668a9f001044d0a0f1ba2de425a36056102
  Author: Richard Purdie <richard.purdie at 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

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index fc501fc..31c9e08 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1574,7 +1574,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():