From c8970462bc4890f4c0b7cc7a84ee877627b88ce5 Mon Sep 17 00:00:00 2001
From: Roman I Khimov <khimov@altell.ru>
Date: Tue, 21 Apr 2009 21:27:46 +0400
Subject: package.bbclass: don't use multilib libs by default

---
 classes/package.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
-- 
cgit 1.2.3-korg