mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Address parse errors while using getVar to calculate dependency information

Browse Source
This commit is contained in:
Derek Straka
2016-02-18 13:24:43 -05:00
parent 2eafa1892d
commit 78e51cd7f4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/cargo.bbclass
+1 -1
View File
@@ -5,7 +5,7 @@ export CARGO_HOME = "${WORKDIR}/cargo_home"
def cargo_base_dep(d): def cargo_base_dep(d):
deps = "" deps = ""
if not d.getVar('INHIBIT_DEFAULT_DEPS') and not d.getVar('INHIBIT_CARGO_DEP'): if not d.getVar('INHIBIT_DEFAULT_DEPS', True) and not d.getVar('INHIBIT_CARGO_DEP', True):
deps += " cargo-native" deps += " cargo-native"
return deps return deps
classes/rust-bin.bbclass
+1 -1
View File
@@ -23,7 +23,7 @@ OVERLAP_LIBS = "\
rand \ rand \
" "
def get_overlap_deps(d): def get_overlap_deps(d):
deps = d.getVar("DEPENDS").split() deps = d.getVar("DEPENDS", True).split()
overlap_deps = [] overlap_deps = []
for o in d.getVar("OVERLAP_LIBS", True).split(): for o in d.getVar("OVERLAP_LIBS", True).split():
l = len([o for dep in deps if (o + '-rs' in dep)]) l = len([o for dep in deps if (o + '-rs' in dep)])
classes/rust.bbclass
+1 -1
View File
@@ -7,7 +7,7 @@ def rust_base_dep(d):
# Taken from meta/classes/base.bbclass `base_dep_prepend` and modified to # Taken from meta/classes/base.bbclass `base_dep_prepend` and modified to
# use rust instead of gcc # use rust instead of gcc
deps = "" deps = ""
if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS'): if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS', True):
if (d.getVar('HOST_SYS', True) != d.getVar('BUILD_SYS', True)): if (d.getVar('HOST_SYS', True) != d.getVar('BUILD_SYS', True)):
deps += " virtual/${TARGET_PREFIX}rust" deps += " virtual/${TARGET_PREFIX}rust"
else: else: