diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2017-10-17 15:38:07 +0800 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2018-07-13 10:31:53 +0800 |
| commit | b63af566e440719ccf8deb58dd684a1c2f3269ef (patch) | |
| tree | 7118ce99dd2f2f66d639830ce3a05ccd0033e8b2 | |
| parent | 9059d54acd6d866664966325c7b1aeef65b2972b (diff) | |
| download | openembedded-core-contrib-b63af566e440719ccf8deb58dd684a1c2f3269ef.tar.gz | |
toolchain-scripts.bbclass: do not extend dependency if extended already
When set MULTILIBS with two or more items, such as for mips64:
MULTILIBS ?= "multilib:lib32 multilib:libn32"
It expands dependency once in mutlib.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']
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 0ff5301530..926be8ba29 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -190,7 +190,18 @@ python __anonymous () { 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() + + # don't extend if dep has been extended already + extended = False + for variant in ml_variants: + if dep.startswith(variant) or dep.startswith('virtual/' + variant): + extended = True + break + if extended: + continue + + for variant in ml_variants: clsextend = oe.classextend.ClassExtender(variant, d) newdep = clsextend.extend_name(dep) deps += " %s:do_populate_sysroot" % newdep |