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

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
+3 -3
View File
@@ -9,11 +9,11 @@ inherit cargo_common
CARGO = "cargo"
# We need cargo to compile for the target
BASEDEPENDS:append = " cargo-native"
BASEDEPENDS_append = " cargo-native"
# Ensure we get the right rust variant
DEPENDS:append:class-target = " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}"
DEPENDS:append:class-native = " rust-native"
DEPENDS_append_class-target = " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}"
DEPENDS_append_class-native = " rust-native"
# Enable build separation
B = "${WORKDIR}/build"
+1 -1
View File
@@ -1,6 +1,6 @@
inherit rust
RDEPENDS:${PN}:append:class-target = " ${RUSTLIB_DEP}"
RDEPENDS_${PN}_append_class-target = " ${RUSTLIB_DEP}"
RUSTC_ARCHFLAGS += "-C opt-level=3 -g -L ${STAGING_DIR_HOST}/${rustlibdir} -C linker=${RUST_TARGET_CCLD}"
EXTRA_OEMAKE += 'RUSTC_ARCHFLAGS="${RUSTC_ARCHFLAGS}"'
+6 -6
View File
@@ -1,8 +1,8 @@
# Common variables used by all Rust builds
export rustlibdir = "${libdir}/rust"
FILES:${PN} += "${rustlibdir}/*.so"
FILES:${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta"
FILES:${PN}-dbg += "${rustlibdir}/.debug"
FILES_${PN} += "${rustlibdir}/*.so"
FILES_${PN}-dev += "${rustlibdir}/*.rlib ${rustlibdir}/*.rmeta"
FILES_${PN}-dbg += "${rustlibdir}/.debug"
RUSTLIB = "-L ${STAGING_LIBDIR}/rust"
RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
@@ -14,7 +14,7 @@ RUST_PANIC_STRATEGY ?= "unwind"
# Native builds are not effected by TCLIBC. Without this, rust-native
# thinks it's "target" (i.e. x86_64-linux) is a musl target.
RUST_LIBC = "${TCLIBC}"
RUST_LIBC:class-native = "glibc"
RUST_LIBC_class-native = "glibc"
def determine_libc(d, thing):
'''Determine which libc something should target'''
@@ -27,7 +27,7 @@ def determine_libc(d, thing):
elif thing == 'BUILD' and (d.getVar('HOST_SYS') != d.getVar('BUILD_SYS')):
libc = d.getVar('RUST_LIBC')
else:
libc = d.getVar('RUST_LIBC:class-native')
libc = d.getVar('RUST_LIBC_class-native')
return libc
@@ -103,7 +103,7 @@ def rust_base_triple(d, thing):
#
# Rust additionally will use two additional cases:
# - undecorated (e.g. CC) - equivalent to TARGET
# - triple suffix (e.g. CC:x86_64_unknown_linux_gnu) - both
# - triple suffix (e.g. CC_x86_64_unknown_linux_gnu) - both
# see: https://github.com/alexcrichton/gcc-rs
# The way that Rust's internal triples and Yocto triples are mapped together
# its likely best to not use the triple suffix due to potential confusion.
+2 -2
View File
@@ -15,7 +15,7 @@ def rust_base_dep(d):
deps += " rust-native"
return deps
DEPENDS:append = " ${@rust_base_dep(d)}"
DEPENDS_append = " ${@rust_base_dep(d)}"
# BUILD_LDFLAGS
# ${STAGING_LIBDIR_NATIVE}
@@ -42,4 +42,4 @@ rustlib_suffix="${TUNE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/rustlib/${HOST_SYS}/li
rustlib_src="${prefix}/lib/${rustlib_suffix}"
# Host sysroot standard library path
rustlib="${libdir}/${rustlib_suffix}"
rustlib:class-native="${libdir}/rustlib/${BUILD_SYS}/lib"
rustlib_class-native="${libdir}/rustlib/${BUILD_SYS}/lib"