[oe-commits] Roman I Khimov : package.bbclass: don't use multilib libs by default

[git version control]

Module: openembedded.git
Branch: rik/amd64
Commit: c8970462bc4890f4c0b7cc7a84ee877627b88ce5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c8970462bc4890f4c0b7cc7a84ee877627b88ce5

Author: Roman I Khimov <khimov at altell.ru>
Date:   Tue Apr 21 21:27:46 2009 +0400

package.bbclass: don't use multilib libs by default

---

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

diff --git a/classes/package.bbclass b/classes/package.bbclass
index ccaa00e..a03b5f1 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