diff options
| author |   Roman I Khimov <khimov@altell.ru> | 2009-04-21 21:27:46 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2009-08-18 23:24:05 +0400 |
| commit | c8970462bc4890f4c0b7cc7a84ee877627b88ce5 (patch) | |
| tree | 09f10364604735a165c28022c5b570c1ee8242fd | |
| parent | 86d2f4efbe7e75dcc5082a38a373aaf1c17df07f (diff) | |
| download | openembedded-c8970462bc4890f4c0b7cc7a84ee877627b88ce5.tar.gz | |
package.bbclass: don't use multilib libs by defaultrik/amd64
| -rw-r--r-- | classes/package.bbclass | 7 |
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 |