From 0f5d26772abfbbae9096fa43901d8620f76aea3c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 16 Mar 2022 17:45:29 +0000 Subject: [PATCH] rust-cross: Add rust-crosssdk variant for nativesdk use Allow nativesdk recipes to find a correct version of the rust cross compiler. Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-devtools/rust/rust-cross.inc | 7 ------- meta/recipes-devtools/rust/rust-cross_1.59.0.bb | 6 ++++++ meta/recipes-devtools/rust/rust-crosssdk_1.59.0.bb | 8 ++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-devtools/rust/rust-crosssdk_1.59.0.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 1a61fefd953..9ef7e206eb2 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -691,6 +691,7 @@ RECIPE_MAINTAINER:pn-ruby = "Ross Burton " RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton " RECIPE_MAINTAINER:pn-rust = "Randy MacLeod " RECIPE_MAINTAINER:pn-rust-cross-${TUNE_PKGARCH}-${TCLIBC} = "Randy MacLeod " +RECIPE_MAINTAINER:pn-rust-crosssdk-${SDK_ARCH}-glibc = "Randy MacLeod " RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod " RECIPE_MAINTAINER:pn-rust-hello-world = "Randy MacLeod " RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod " diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc index a77f7d51223..f6babfeedaa 100644 --- a/meta/recipes-devtools/rust/rust-cross.inc +++ b/meta/recipes-devtools/rust/rust-cross.inc @@ -1,6 +1,3 @@ -require rust.inc -inherit cross - python do_rust_gen_targets () { wd = d.getVar('WORKDIR') + '/targets/' # It is important 'TARGET' is last here so that it overrides our less @@ -30,12 +27,8 @@ INHIBIT_DEFAULT_RUST_DEPS = "1" # so it might make sense to take it's mapping. For now, though, we just mention # the bits we need explicitly. DEPENDS += "rust-llvm-native" -DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc" DEPENDS += "rust-native" -PROVIDES = "virtual/${TARGET_PREFIX}rust" -PN = "rust-cross-${TUNE_PKGARCH}-${TCLIBC}" - # In the cross compilation case, rustc doesn't seem to get the rpath quite # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't # include the '../../lib' (ie: relative path from cross_bindir to normal diff --git a/meta/recipes-devtools/rust/rust-cross_1.59.0.bb b/meta/recipes-devtools/rust/rust-cross_1.59.0.bb index 3179d395d25..5358d98da85 100644 --- a/meta/recipes-devtools/rust/rust-cross_1.59.0.bb +++ b/meta/recipes-devtools/rust/rust-cross_1.59.0.bb @@ -1,2 +1,8 @@ +require rust.inc +inherit cross require rust-cross.inc require rust-source.inc + +DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc" +PROVIDES = "virtual/${TARGET_PREFIX}rust" +PN = "rust-cross-${TUNE_PKGARCH}-${TCLIBC}" diff --git a/meta/recipes-devtools/rust/rust-crosssdk_1.59.0.bb b/meta/recipes-devtools/rust/rust-crosssdk_1.59.0.bb new file mode 100644 index 00000000000..5929978591f --- /dev/null +++ b/meta/recipes-devtools/rust/rust-crosssdk_1.59.0.bb @@ -0,0 +1,8 @@ +require rust.inc +inherit crosssdk +require rust-cross.inc +require rust-source.inc + +DEPENDS += "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/nativesdk-${TARGET_PREFIX}compilerlibs virtual/nativesdk-libc" +PROVIDES = "virtual/nativesdk-${TARGET_PREFIX}rust" +PN = "rust-crosssdk-${TUNE_PKGARCH}-${TCLIBC}" -- 2.47.2