diff --git a/recipes/cargo/cargo.inc b/recipes/cargo/cargo.inc index da66aec..d1ec42f 100644 --- a/recipes/cargo/cargo.inc +++ b/recipes/cargo/cargo.inc @@ -23,7 +23,10 @@ PV .= "+git${SRCPV}" S = "${WORKDIR}/git" B = "${S}" -# PACKAGECONFIG is set in .bb files +PACKAGECONFIG ??= "" + +# Note: this does not appear to work very well due to our use of bitbake triples +# & rust's use of cooked triples PACKAGECONFIG[rust-snapshot] = "--local-rust-root=${B}/rustc" do_configure () { diff --git a/recipes/cargo/cargo_git.bb b/recipes/cargo/cargo_git.bb index 9833488..1ea2218 100644 --- a/recipes/cargo/cargo_git.bb +++ b/recipes/cargo/cargo_git.bb @@ -1,5 +1,5 @@ -SRCREV_cargo = "e6abfbb959b363248ee03c731a67d2897dd061ce" -PACKAGECONFIG ??= "rust-snapshot" +# 2015-2-12 +SRCREV_cargo = "0b84923203dce67ff8cf051728b6908c9c2e303c" require cargo.inc @@ -12,11 +12,11 @@ SRC_URI += " \ file://ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch;patchdir=../ssh2-rs \ " -# 0.1.4 -#SRCREV_curl-rust = "6f4d66ed0bc5e71a0ea86a37f038f7c9f73dc3ae" -# 0.1.3 -SRCREV_curl-rust = "4517ee606c65bbe03e4ad4f661725eb80e667a69" -SRCREV_ssh2-rs = "509a8459e466ffa4705a0c686b80ac80b499f5d5" +# 0.1.14 +SRCREV_curl-rust = "9181ea8f4ea2c7eb60224b5ebf464751165e2881" + +# libssh2-sys 0.1.5 +2015-2-10 +SRCREV_ssh2-rs = "8baa8ccb39cd1a43362d2a1ee87d8c3b91496cd7" SRCREV_FORMAT = "cargo_curl-rust_ssh2-rs" EXTRA_OECARGO_PATHS = "\ ${WORKDIR}/curl-rust \