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

Revert "Convert to new override syntax (#357)"

Browse Source 
This commit is not compatible with zeus layer so revert it.

This reverts commit bf6705fb7f.

Signed-off-by: Clément Péron <peron.clem@gmail.com>
This commit is contained in:
Clément Péron
2021-11-21 14:59:27 +01:00
parent bf6705fb7f
commit 0ecc9b5c2b
25 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-devtools/cargo/cargo-cross-canadian.inc
+3 -3
View File
@@ -9,7 +9,7 @@ require recipes-devtools/rust/rust-common.inc
require cargo.inc
CARGO = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo"
BASEDEPENDS:remove = "cargo-native"
BASEDEPENDS_remove = "cargo-native"
export RUST_TARGET_PATH="${WORKDIR}/targets/"
@@ -37,7 +37,7 @@ python do_rust_gen_targets () {
rust_gen_target(d, 'HOST', wd, "", "generic", d.getVar('HOST_ARCH'))
}
do_compile:prepend () {
do_compile_prepend () {
PKG_CONFIG_PATH="${RECIPE_SYSROOT_NATIVE}/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
}
@@ -70,5 +70,5 @@ do_install () {
}
PKG_SYS_BINDIR = "${SDKPATHNATIVE}/usr/bin"
FILES:${PN} += "${base_prefix}/environment-setup.d ${PKG_SYS_BINDIR}"
FILES_${PN} += "${base_prefix}/environment-setup.d ${PKG_SYS_BINDIR}"
recipes-devtools/cargo/cargo-cross-canadian_1.49.0.bb
+1 -1
View File
@@ -1,6 +1,6 @@
require recipes-devtools/rust/rust-source-${PV}.inc
require recipes-devtools/rust/rust-snapshot-${PV}.inc
FILESEXTRAPATHS:prepend := "${THISDIR}/cargo-${PV}:"
FILESEXTRAPATHS_prepend := "${THISDIR}/cargo-${PV}:"
require cargo-cross-canadian.inc
recipes-devtools/cargo/cargo-cross-canadian_1.51.0.bb
+1 -1
View File
@@ -1,6 +1,6 @@
require recipes-devtools/rust/rust-source-${PV}.inc
require recipes-devtools/rust/rust-snapshot-${PV}.inc
FILESEXTRAPATHS:prepend := "${THISDIR}/cargo-${PV}:"
FILESEXTRAPATHS_prepend := "${THISDIR}/cargo-${PV}:"
require cargo-cross-canadian.inc
recipes-devtools/cargo/cargo.inc
+3 -3
View File
@@ -25,7 +25,7 @@ do_cargo_setup_snapshot () {
addtask cargo_setup_snapshot after do_unpack before do_configure
do_cargo_setup_snapshot[dirs] += "${WORKDIR}/${CARGO_SNAPSHOT}"
do_compile:prepend () {
do_compile_prepend () {
export RUSTC_BOOTSTRAP="1"
}
@@ -47,5 +47,5 @@ BBCLASSEXTEND = "native nativesdk"
# When building cargo-native we don't have cargo-native to use and depend on,
# so we must use the locally set up snapshot to bootstrap the build.
BASEDEPENDS:remove:class-native = "cargo-native"
CARGO:class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo"
BASEDEPENDS_remove_class-native = "cargo-native"
CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/bin/cargo"