package.bbclass: Fix support for private libs
PATCH 1/1 package.bbclass: Fix support for private libs
* n is a tuple since this commit:
commit d3aa7668a9f001044d0a0f1ba2de425a36056102
Author: Richard Purdie <[email protected]>
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
--- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/package.bbclass +1 -1
@@ -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():
Signature · 1 line
2.2.1
Quoted 11 lines · Martin Jansa
* n is a tuple since this commit:
commitd3aa7668a9f001044d0a0f1ba2de425a36056102
Author: Richard Purdie <[email protected]>
Date: Mon Jul 7 18:41:23 2014 +0100
Subject package.bbclass: Improve shlibs needed data structuresince 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
ping
Quoted 22 lines
Signed-off-by Martin Jansa <[email protected]>--- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/classes/package.bbclass +1
-1@@ -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():Signature · 1 line
2.2.1
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
thanks for the reminder. I have pulled into my staging work.
-armin
Quoted 40 lines · Martin Jansa
Quoted 11 lines · Martin Jansa
* n is a tuple since this commit:
commitd3aa7668a9f001044d0a0f1ba2de425a36056102
Author: Richard Purdie <[email protected]>
Date: Mon Jul 7 18:41:23 2014 +0100
Subject package.bbclass: Improve shlibs needed data structuresince 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 libfooping
Quoted 22 lines
Signed-off-by Martin Jansa <[email protected]>--- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/classes/package.bbclass +1
-2@@ -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(): --2.2.1