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

Update the source paths for each item

Browse Source 
The path to the rust source changes from 1.15 so preemptively make
changes to prepare for that.

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
This commit is contained in:
Derek Straka
2017-03-07 12:11:25 -06:00
committed by Doug Goldstein
parent 502fc9b1d1
commit 64cdd4b714
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-devtools/rust/compiler-rt.inc
-2
View File
@@ -12,8 +12,6 @@ DEPENDS += "rust-llvm-native (=${PV})"
RDEPENDS_${PN}-dev = "" RDEPENDS_${PN}-dev = ""
INSANE_SKIP_${PN}-dev = "staticdev" INSANE_SKIP_${PN}-dev = "staticdev"
S = "${WORKDIR}/rustc-${PV}"
DISABLE_STATIC = "" DISABLE_STATIC = ""
INHIBIT_DEFAULT_RUST_DEPS = "1" INHIBIT_DEFAULT_RUST_DEPS = "1"
recipes-devtools/rust/libstd-rs.inc
-4
View File
@@ -4,8 +4,6 @@ SECTION = "devel"
LICENSE = "MIT | Apache-2.0" LICENSE = "MIT | Apache-2.0"
LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=43e1f1fb9c0ee3af66693d8c4fecafa8" LIC_FILES_CHKSUM ="file://COPYRIGHT;md5=43e1f1fb9c0ee3af66693d8c4fecafa8"
S = "${WORKDIR}/rustc-${PV}"
SRC_URI += "\ SRC_URI += "\
crate://crates.io/gcc/0.3.27 \ crate://crates.io/gcc/0.3.27 \
" "
@@ -18,8 +16,6 @@ inherit cargo
# Needed so cargo can find libbacktrace # Needed so cargo can find libbacktrace
RUSTFLAGS += "-L ${STAGING_LIBDIR}" RUSTFLAGS += "-L ${STAGING_LIBDIR}"
S = "${WORKDIR}/rustc-${PV}"
do_compile_prepend () { do_compile_prepend () {
cd ${S}/src/rustc/std_shim cd ${S}/src/rustc/std_shim
export CARGO_TARGET_DIR="${B}" export CARGO_TARGET_DIR="${B}"
recipes-devtools/rust/libstd-rs_1.12.1.bb
+1 -1
View File
@@ -1,2 +1,2 @@
require libstd-rs.inc
require rust-source-${PV}.inc require rust-source-${PV}.inc
require libstd-rs.inc
recipes-devtools/rust/libstd-rs_1.14.0.bb
+1 -1
View File
@@ -1,2 +1,2 @@
require libstd-rs.inc
require rust-source-${PV}.inc require rust-source-${PV}.inc
require libstd-rs.inc
recipes-devtools/rust/rust-llvm.inc
+1 -1
View File
@@ -1,7 +1,7 @@
SUMMARY = "LLVM compiler framework (packaged with rust)" SUMMARY = "LLVM compiler framework (packaged with rust)"
LICENSE = "NCSA" LICENSE = "NCSA"
S = "${WORKDIR}/rustc-${PV}/src/llvm" S = "${RUSTSRC}/src/llvm"
LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
recipes-devtools/rust/rust-llvm_1.12.1.bb
+1 -1
View File
@@ -1,5 +1,5 @@
require rust-llvm.inc
require rust-source-${PV}.inc require rust-source-${PV}.inc
require rust-llvm.inc
LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=43fdaa303c1c5589ad60f4ffc6a0b9ce" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=43fdaa303c1c5589ad60f4ffc6a0b9ce"
recipes-devtools/rust/rust-llvm_1.14.0.bb
+1 -1
View File
@@ -1,5 +1,5 @@
require rust-llvm.inc
require rust-source-${PV}.inc require rust-source-${PV}.inc
require rust-llvm.inc
LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=43fdaa303c1c5589ad60f4ffc6a0b9ce" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=43fdaa303c1c5589ad60f4ffc6a0b9ce"
recipes-devtools/rust/rust-source-1.12.1.inc
+4
View File
@@ -19,3 +19,7 @@ SRC_URI += "\
SRC_URI[rust.md5sum] = "82db5a9cb9a051bf8ece2f5174cb273b" SRC_URI[rust.md5sum] = "82db5a9cb9a051bf8ece2f5174cb273b"
SRC_URI[rust.sha256sum] = "97913ae4cb255618aaacd1a534b11f343634b040b32656250d09d8d9ec02d3dc" SRC_URI[rust.sha256sum] = "97913ae4cb255618aaacd1a534b11f343634b040b32656250d09d8d9ec02d3dc"
# later versions of rust change the directory that they unextract to
RUSTSRC = "${WORKDIR}/rustc-${PV}"
# set this as our default
S = "${RUSTSRC}"
recipes-devtools/rust/rust-source-1.14.0.inc
+4
View File
@@ -18,3 +18,7 @@ SRC_URI += "\
SRC_URI[rust.md5sum] = "00b6bb5b465e7bd89c541eea99876cdc" SRC_URI[rust.md5sum] = "00b6bb5b465e7bd89c541eea99876cdc"
SRC_URI[rust.sha256sum] = "c790edd2e915bd01bea46122af2942108479a2fda9a6f76d1094add520ac3b6b" SRC_URI[rust.sha256sum] = "c790edd2e915bd01bea46122af2942108479a2fda9a6f76d1094add520ac3b6b"
# later versions of rust change the directory that they unextract to
RUSTSRC = "${WORKDIR}/rustc-${PV}"
# set this as our default
S = "${RUSTSRC}"
recipes-devtools/rust/rust.inc
-2
View File
@@ -10,8 +10,6 @@ SRC_URI = "\
https://static.rust-lang.org/dist/${RUST_SNAPSHOT}.tar.gz;name=rust-snapshot \ https://static.rust-lang.org/dist/${RUST_SNAPSHOT}.tar.gz;name=rust-snapshot \
" "
S = "${WORKDIR}/rustc-${PV}"
DEPENDS += "file-native" DEPENDS += "file-native"
# We generate local targets, and need to be able to locate them # We generate local targets, and need to be able to locate them