mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 00:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

native.bbclass: Fix DEPENDS handling for BBCLASSEXTEND use

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-11-09 16:04:51 +00:00
parent e782788756
commit 7b849ae2f5
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
meta/classes/native.bbclass
View File

@@ -82,45 +82,37 @@ do_stage () {
PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
PKG_CONFIG_SYSROOT_DIR = "" PKG_CONFIG_SYSROOT_DIR = ""
ORIG_DEPENDS := "${DEPENDS}"
DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}"
python __anonymous () { python __anonymous () {
# If we've a legacy native do_stage, we need to neuter do_install # If we've a legacy native do_stage, we need to neuter do_install
stagefunc = bb.data.getVar('do_stage', d, True) stagefunc = bb.data.getVar('do_stage', d, True)
if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
bb.data.setVar("do_install", " :", d) bb.data.setVar("do_install", " :", d)
if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""):
pn = bb.data.getVar("PN", d, True) pn = bb.data.getVar("PN", d, True)
depends = bb.data.getVar("DEPENDS", d, True) depends = bb.data.getVar("DEPENDS_virtclass-native", d, True)
deps = bb.utils.explode_deps(depends) deps = bb.utils.explode_deps(depends)
newdeps = [] newdeps = []
if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""):
autoextend = True
else:
autoextend = False
for dep in deps: for dep in deps:
if dep.endswith("-cross"): if dep.endswith("-cross"):
if autoextend:
newdeps.append(dep.replace("-cross", "-native")) newdeps.append(dep.replace("-cross", "-native"))
else:
bb.note("%s has depends %s which ends in -cross?" % (pn, dep))
newdeps.append(dep)
elif not dep.endswith("-native"): elif not dep.endswith("-native"):
if autoextend:
newdeps.append(dep + "-native") newdeps.append(dep + "-native")
else: else:
bb.note("%s has depends %s which doesn't end in -native?" % (pn, dep))
newdeps.append(dep) newdeps.append(dep)
else: bb.data.setVar("DEPENDS_virtclass-native", " ".join(newdeps), d)
newdeps.append(dep)
bb.data.setVar("DEPENDS", " ".join(newdeps), d)
provides = bb.data.getVar("PROVIDES", d, True) provides = bb.data.getVar("PROVIDES", d, True)
for prov in provides.split(): for prov in provides.split():
if prov.find(pn) != -1: if prov.find(pn) != -1:
continue continue
if not prov.endswith("-native"): if not prov.endswith("-native"):
if autoextend:
provides = provides.replace(prov, prov + "-native") provides = provides.replace(prov, prov + "-native")
#else:
# bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov))
bb.data.setVar("PROVIDES", provides, d) bb.data.setVar("PROVIDES", provides, d)
bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-native", d) bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-native", d)
} }