diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-09 14:45:57 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:28 +0000 |
| commit | c6f860596cb461a1c144775b5a69e6d50974b531 (patch) | |
| tree | 16e41e5049c7150773012181f7a309ed6c9993a1 | |
| parent | aa08ac8f6883d47dcd6d3a490dd923b042c989bd (diff) | |
| download | openembedded-core-c6f860596cb461a1c144775b5a69e6d50974b531.tar.gz openembedded-core-c6f860596cb461a1c144775b5a69e6d50974b531.tar.bz2 openembedded-core-c6f860596cb461a1c144775b5a69e6d50974b531.zip | |
base/autotools.bbclass: Make sure extra dependencies are not lost for native and nativesdk BBCLASSEXTEND. Ugly but no simpler/neater way seems possible
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/classes/autotools.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/native.bbclass | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 57a8b0ed18..1fb65715b3 100644 --- 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 5efa6c2128..053d80f6fd 100644 --- 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 2bd0cf3dfe..8a5e5f133f 100644 --- 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 |