[oe-commits] Ross Burton : native: remove PN from DEPENDS automatically

[git at git.openembedded.org]

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

Author: Ross Burton <ross.burton at intel.com>
Date:   Mon Feb  2 11:03:28 2015 +0000

native: remove PN from DEPENDS automatically

If a recipe (say, wayland) has DEPENDS=wayland-native and BBCLASSEXTEND=native,
when built as wayland-native it has DEPENDS=wayland-native which results in a
circular dependency.

Typically this is resolved by having explicit DEPENDS_class-native statements
but as this is duplication which can lead to inconsistent dependencies,
automatically remove the circular dependency.

Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 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 4acc936..5ca5c95 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -132,7 +132,9 @@ python native_virtclass_handler () {
         deps = bb.utils.explode_deps(deps)
         newdeps = []
         for dep in deps:
-            if "-cross-" in dep:
+            if dep == pn:
+                continue
+            elif "-cross-" in dep:
                 newdeps.append(dep.replace("-cross", "-native"))
             elif not dep.endswith("-native"):
                 newdeps.append(dep + "-native")