[OE-core] [PATCH 1/1] toolchain-scripts.bbclass: do not extend dependency if extended already
kai.kang at windriver.com
kai.kang at windriver.com
Wed Oct 18 08:02:05 UTC 2017
From: Kai Kang <kai.kang at windriver.com>
When set MULTILIBS with two or more items, such as for mips64:
MULTILIBS ?= "multilib:lib32 multilib:libn32"
It extends dependency package name once in multilib.bbclass, and expand again
in toolchain-scripts.bbclass which causes error:
| ERROR: Nothing PROVIDES 'virtual/lib32-libn32-libc'. Close matches:
| virtual/libn32-libc
| virtual/lib32-libc
| virtual/libn32-librpc
| ERROR: Required build target 'libn32-meta-ide-support' has no buildable providers.
| Missing or unbuildable dependency chain was: ['libn32-meta-ide-support', 'virtual/lib32-libn32-libc']
Don't extend package name if it has been extended already.
Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
meta/classes/toolchain-scripts.bbclass | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 9bcfe708c7..4e4334abbb 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -150,11 +150,17 @@ toolchain_create_sdk_siteconfig () {
toolchain_create_sdk_siteconfig[vardepsexclude] = "TOOLCHAIN_CONFIGSITE_SYSROOTCACHE"
python __anonymous () {
+ import re
import oe.classextend
deps = ""
for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or "").split():
deps += " %s:do_populate_sysroot" % dep
- for variant in (d.getVar('MULTILIB_VARIANTS') or "").split():
+ ml_variants = (d.getVar('MULTILIB_VARIANTS') or "").split()
+ for variant in ml_variants:
+ # don't extend if dep has been extended already
+ if filter(lambda x: re.match('(virtual/)?' + x, dep), ml_variants):
+ continue
+
clsextend = oe.classextend.ClassExtender(variant, d)
newdep = clsextend.extend_name(dep)
deps += " %s:do_populate_sysroot" % newdep
--
2.14.1
More information about the Openembedded-core
mailing list