[oe-commits] Richard Purdie : native: Move virtclass override to earlier so DEPENDS is handled correctly

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e9bfd0583d7796cb9f71ff8762650e057103e3d2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e9bfd0583d7796cb9f71ff8762650e057103e3d2

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Jul 21 12:16:03 2015 +0100

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 at linuxfoundation.org>

---

 meta/classes/native.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 71b0572..bcbcd61 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