re-add older rust, disable newer by default, allow cargo dep to be disabled

This commit is contained in:
Cody P Schafer
2014-12-02 14:00:40 -05:00
parent 8a698c1e51
commit c42a9f51dd
4 changed files with 28 additions and 0 deletions
+8
View File
@@ -2,6 +2,14 @@ inherit rust
CARGO = "cargo"
def cargo_base_dep(d):
deps = ""
if not d.getVar('INHIBIT_DEFAULT_DEPS') and not d.getVar('INHIBIT_CARGO_DEP'):
deps += " cargo-native"
return deps
BASEDEPENDS_append = " ${@cargo_base_dep(d)}"
# FIXME: this is a workaround for a misbehavior in cargo when used with quilt.
# See https://github.com/rust-lang/cargo/issues/978
PATCHTOOL = "patch"
+2
View File
@@ -1,3 +1,5 @@
INHIBIT_CARGO_DEP = "1"
inherit cargo
inherit patch
+16
View File
@@ -0,0 +1,16 @@
SRCREV = "c637cab85323c97be37d0c12bfa0fc0e9ea2c367"
require rust-git.inc
SRC_URI_append = "\
file://0001-libstd-io-process-Command-fully-quote-and-escape-the.patch \
file://0002-std-io-process-add-Show-tests.patch \
file://0003-platform.mk-avoid-choking-on-i586.patch \
file://0004-mk-rt-compiler_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch \
file://0005-Target-add-default-target.json-path-libdir-rust-targ.patch \
file://0006-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \
file://0007-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \
file://0008-configure-support-bindir-and-extend-libdir-to-non-bl.patch \
file://0009-XXX-remove-conflicting-realpath-hack.patch \
file://0010-XXX-configure-unneeded-windows-check.patch \
file://0011-Parallelize-submake-invocations.patch \
"
+2
View File
@@ -14,3 +14,5 @@ SRC_URI_append = "\
file://0010-XXX-configure-unneeded-windows-check.patch \
file://0011-Parallelize-submake-invocations.patch \
"
DEFAULT_PREFERENCE = "-1"