]> code.ossystems Code Review - openembedded-core.git/commitdiff
package bbclass: allow per package PRIVATE_LIBS
authorKoen Kooi <koen@dominion.thruhere.net>
Fri, 27 Jan 2012 16:50:40 +0000 (17:50 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 1 Feb 2012 15:15:05 +0000 (15:15 +0000)
If a recipe packages multiple versions of shlib (e.g. powervr drivers) we only want the shlib code to pickup $PN, not $PN-foo subpackages.
This keeps backward compatibility with the global PRIVATE_LIBS usage if no per package PRIVATE_LIBS are set for a given package. In other words: this doesn't break the firefox recipe.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/package.bbclass

index 68a2539c6f6debc334f72e3fb02f03f43b857847..348c13ce5edc07cd153eba3f8d979b8164e23cbb 100644 (file)
@@ -1326,8 +1326,8 @@ python package_do_shlibs() {
 
        needed = {}
        shlib_provider = {}
-       private_libs = d.getVar('PRIVATE_LIBS', True)
        for pkg in packages.split():
+               private_libs = d.getVar('PRIVATE_LIBS_' + pkg, True) or d.getVar('PRIVATE_LIBS', True)
                needs_ldconfig = False
                bb.debug(2, "calculating shlib provides for %s" % pkg)