summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 114d6559f5..aa8451ffe8 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1646,7 +1646,8 @@ python package_do_shlibs() {
1646 prov = (this_soname, ldir, pkgver) 1646 prov = (this_soname, ldir, pkgver)
1647 if not prov in sonames: 1647 if not prov in sonames:
1648 # if library is private (only used by package) then do not build shlib for it 1648 # if library is private (only used by package) then do not build shlib for it
1649 if not private_libs or this_soname not in private_libs: 1649 import fnmatch
1650 if not private_libs or len([i for i in private_libs if fnmatch.fnmatch(this_soname, i)]) == 0:
1650 sonames.add(prov) 1651 sonames.add(prov)
1651 if libdir_re.match(os.path.dirname(file)): 1652 if libdir_re.match(os.path.dirname(file)):
1652 needs_ldconfig = True 1653 needs_ldconfig = True
@@ -1829,7 +1830,8 @@ python package_do_shlibs() {
1829 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1 1830 # /opt/abc/lib/libfoo.so.1 and contains /usr/bin/abc depending on system library libfoo.so.1
1830 # but skipping it is still better alternative than providing own 1831 # but skipping it is still better alternative than providing own
1831 # version and then adding runtime dependency for the same system library 1832 # version and then adding runtime dependency for the same system library
1832 if private_libs and n[0] in private_libs: 1833 import fnmatch
1834 if private_libs and len([i for i in private_libs if fnmatch.fnmatch(n[0], i)]) > 0:
1833 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) 1835 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
1834 continue 1836 continue
1835 if n[0] in shlib_provider.keys(): 1837 if n[0] in shlib_provider.keys():