base/autotools.bbclass: Make sure extra dependencies are not lost for native and...

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

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 57a8b0ed187057953865ea0813e82b9d5cf6a742..1fb65715b3a0c1b2cb018faa816383795fe65963 100644 (file)
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -22,7 +22,11 @@ def autotools_dep_prepend(d):
        return deps + 'gnu-config-native '
 
 EXTRA_OEMAKE = ""
+
 DEPENDS_prepend = "${@autotools_dep_prepend(d)}"
+DEPENDS_virtclass-native_prepend = "${@autotools_dep_prepend(d)}"
+DEPENDS_virtclass-nativesdk_prepend = "${@autotools_dep_prepend(d)}"
+
 acpaths = "default"
 EXTRA_AUTORECONF = "--exclude=autopoint"
 

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 5efa6c212864e2046eb2bde9e34e2374e638edd4..053d80f6fd01bd3c1f4eb942b5d6565f2e0b93d4 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -158,6 +158,8 @@ def base_both_contain(variable1, variable2, checkvalue, d):
                return ""
 
 DEPENDS_prepend="${@base_dep_prepend(d)} "
+DEPENDS_virtclass-native_prepend="${@base_dep_prepend(d)} "
+DEPENDS_virtclass-nativesdk_prepend="${@base_dep_prepend(d)} "
 
 def base_prune_suffix(var, suffixes, d):
     # See if var ends with any of the suffixes listed and 

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 2bd0cf3dfe426f0efd2aaec825ce7f38dbdec19e..8a5e5f133f5a4db69bee4df3ccf998392f845bcf 100644 (file)
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -91,8 +91,6 @@ python __anonymous () {
     pn = bb.data.getVar("PN", d, True)
     depends = bb.data.getVar("DEPENDS", d, True)
     deps = bb.utils.explode_deps(depends)
-    depends = bb.data.getVar("DEPENDS", d, True)
-    deps = bb.utils.explode_deps(depends)
     newdeps = []
     if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""):
         autoextend = True