nativesdk.bbclass: Fix various DEPENDS handling bugs and add to OVERRIDES (from poky)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass
index 080adc5..75f5790 100644 (file)
--- a/classes/nativesdk.bbclass
+++ b/classes/nativesdk.bbclass
@@ -51,9 +51,12 @@ FILES_${PN}-dbg += "${prefix}/.debug \
 export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
 
+ORIG_DEPENDS := "${DEPENDS}"
+DEPENDS_virtclass-nativesdk ?= "${ORIG_DEPENDS}"
+
 python __anonymous () {
     pn = bb.data.getVar("PN", d, True)
-    depends = bb.data.getVar("DEPENDS", d, True)
+    depends = bb.data.getVar("DEPENDS_virtclass-nativesdk", d, True)
     deps = bb.utils.explode_deps(depends)
     newdeps = []
     for dep in deps:
@@ -65,7 +68,7 @@ python __anonymous () {
             newdeps.append(dep + "-nativesdk")
         else:
             newdeps.append(dep)
-    bb.data.setVar("DEPENDS", " ".join(newdeps), d)
+    bb.data.setVar("DEPENDS_virtclass-nativesdk", " ".join(newdeps), d)
     provides = bb.data.getVar("PROVIDES", d, True)
     for prov in provides.split():
         if prov.find(pn) != -1:
@@ -73,6 +76,7 @@ python __anonymous () {
         if not prov.endswith("-nativesdk"):
             provides = provides.replace(prov, prov + "-nativesdk")
     bb.data.setVar("PROVIDES", provides, d)
+    bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-nativesdk", d)
 }