aboutsummaryrefslogtreecommitdiffstats
path: root/classes/package.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'classes/package.bbclass')
-rw-r--r--classes/package.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index ccaa00ea8a..a03b5f1b71 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -670,7 +670,12 @@ python package_do_shlibs() {
bb.utils.unlockfile(lf)
shlib_provider = {}
- list_re = re.compile('^(.*)\.list$')
+ # Exclude multilib library providers by default
+ multilibarch = bb.data.getVar('ARCH_MULTILIB', d, 1)
+ if not multilibarch:
+ list_re = re.compile('^(.*)\.list$')
+ else:
+ list_re = re.compile("^((-?[^-]*(?!-%s))+)\.list$" % (multilibarch))
for dir in [shlibs_dir]:
if not os.path.exists(dir):
continue