From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 21 Jul 2015 11:16:03 +0000 (+0100)
Subject: native: Move virtclass override to earlier so DEPENDS is handled correctly
X-Git-Tag: 2015-10~1160
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e9bfd0583d7796cb9f71ff8762650e057103e3d2;p=openembedded-core.git

native: Move virtclass override to earlier so DEPENDS is handled correctly

Currently the virtclass override is added too late to be taken into
account when DEPENDS and other variables are processed by the virtclass
extension code. This sets the overrides in a more optimal place, meaning
they are accounted for in variables like DEPENDS.

Recipes in meta-oe like libwmf-native showed the issue.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 71b05720f2..bcbcd61e03 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -142,6 +142,8 @@ python native_virtclass_handler () {
                 newdeps.append(dep)
         d.setVar(varname, " ".join(newdeps))
 
+    e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native")
+
     map_dependencies("DEPENDS", e.data)
     for pkg in [e.data.getVar("PN", True), "", "${PN}"]:
         map_dependencies("RDEPENDS", e.data, pkg)
@@ -161,7 +163,7 @@ python native_virtclass_handler () {
             nprovides.append(prov)
     e.data.setVar("PROVIDES", ' '.join(nprovides))
 
-    e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native")
+
 }
 
 addhandler native_virtclass_handler