On 2017年10月18日 16:02, [email protected] wrote:
From: Kai Kang <[email protected]>

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.

Any comment? Thanks.

--Kai


Signed-off-by: Kai Kang <[email protected]>
---
  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


--
Regards,
Neil | Kai Kang

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to