The rust recipe inherits cargo_common which now depends on rust-native and cargo-native, so we can just remove those dependencies in the native case instead of having to handle target/nativesdk.
Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-devtools/rust/rust_1.96.1.bb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/rust/rust_1.96.1.bb b/meta/recipes-devtools/rust/rust_1.96.1.bb index f8f47b04142..7d1761c562c 100644 --- a/meta/recipes-devtools/rust/rust_1.96.1.bb +++ b/meta/recipes-devtools/rust/rust_1.96.1.bb @@ -12,21 +12,19 @@ inherit rust inherit cargo_common DEPENDS += "llvm" + # native rust uses cargo/rustc from binary snapshots to bootstrap # but everything else should use our native builds -DEPENDS:append:class-target = " cargo-native rust-native" -DEPENDS:append:class-nativesdk = " cargo-native rust-native" +DEPENDS:remove:class-native = "cargo-native" +INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" + +PROVIDES:class-native = "virtual/${TARGET_PREFIX}rust" RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" PACKAGECONFIG ??= "llvm-shared" PACKAGECONFIG[llvm-shared] = ",,," -# Otherwise we'll depend on what we provide -INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" -# We don't need to depend on gcc-native because yocto assumes it exists -PROVIDES:class-native = "virtual/${TARGET_PREFIX}rust" - S = "${RUSTSRC}" # Separate build directory from the shared source tree so that multiple # variants (target, native, nativesdk) don't conflict in the source dir. -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#242785): https://lists.openembedded.org/g/openembedded-core/message/242785 Mute This Topic: https://lists.openembedded.org/mt/120596990/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
