summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-02-02 11:03:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:43 +0000
commit3e9392c0965166462e0993d46f4cc2fb1832f1e5 (patch)
tree036ed1ab137823f4df5468a7d8ef0318f0d8311d
parent2a675bc63b22724f12e6ed6ff58d0f1d1e0d3b29 (diff)
downloadopenembedded-core-contrib-3e9392c0965166462e0993d46f4cc2fb1832f1e5.tar.gz
openembedded-core-contrib-3e9392c0965166462e0993d46f4cc2fb1832f1e5.tar.bz2
openembedded-core-contrib-3e9392c0965166462e0993d46f4cc2fb1832f1e5.zip
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@intel.com>
-rw-r--r--meta/classes/native.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 4acc936ccd..5ca5c95b4d 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")