diff --git a/recipes/cargo/cargo_2014-10-09.bb b/recipes/cargo/cargo_2014-10-09.bb index c59f6de..3942487 100644 --- a/recipes/cargo/cargo_2014-10-09.bb +++ b/recipes/cargo/cargo_2014-10-09.bb @@ -1,8 +1,9 @@ SRCREV = "2d101e2e3809da5dc6c79c27ad962d7945cddfb5" -do_patch_prepend () { +do_patch () { # Work around a bug in openssl-static-sys mkdir -p "${prefix}/lib" ln -sf "${base_prefix}/lib/libcrypto.a" "${prefix}/lib/" } + require cargo.inc diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc index cf48a65..8dab233 100644 --- a/recipes/rust/rust.inc +++ b/recipes/rust/rust.inc @@ -7,6 +7,10 @@ LICENSE = "MIT | Apache-2.0" B = "${WORKDIR}/build" +LIC_FILES_CHKSUM ="\ + file://COPYRIGHT;md5=0e8e4a3b5d8e1c90eb243d406369763a \ +" + do_configure () { # FIXME: allow --enable-local-rust # FIXME: target_prefix vs prefix, see cross.bbclass diff --git a/recipes/rust/rust_0.12.0+2014-10-21.bb b/recipes/rust/rust_0.12.0+2014-10-21.bb new file mode 100644 index 0000000..a292142 --- /dev/null +++ b/recipes/rust/rust_0.12.0+2014-10-21.bb @@ -0,0 +1,4 @@ + +SRCREV = "7b021859a4ea33bb0f5512649a5c9792648e9ad6" + +require rust-git.inc diff --git a/recipes/rust/rust_0.12.0+2014-10-28.bb b/recipes/rust/rust_0.12.0+2014-10-28.bb index f42a0a9..e9d7976 100644 --- a/recipes/rust/rust_0.12.0+2014-10-28.bb +++ b/recipes/rust/rust_0.12.0+2014-10-28.bb @@ -1,7 +1,5 @@ -LIC_FILES_CHKSUM ="\ - file://COPYRIGHT;md5=0e8e4a3b5d8e1c90eb243d406369763a \ -" - SRCREV = "1652a1f2c61883c5f2b55a952796619d8aef365e" - require rust-git.inc + +# Doesn't build cargo as of 2014-10-28 +DEFAULT_PREFERENCE = "-1" diff --git a/recipes/rust/rust_0.12.0.bb b/recipes/rust/rust_0.12.0.bb index 9d1d67d..384198d 100644 --- a/recipes/rust/rust_0.12.0.bb +++ b/recipes/rust/rust_0.12.0.bb @@ -1,11 +1,7 @@ SRC_URI[md5sum] = "24f80304da2ef1c0362b7caf700390f9" SRC_URI[sha256sum] = "883e66b24d90d9957c5c538469fcde6f0668e5fb6448beecfc60884060e769b7" -LIC_FILES_CHKSUM ="\ - file://COPYRIGHT;md5=0e8e4a3b5d8e1c90eb243d406369763a \ -" SRC_URI_append = "\ file://0001-mk-rt-export-CC-does-not-seem-to-work-gcc-observed-u.patch \ " - require rust-release.inc