summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/rust/rust_1.86.0.bb11
1 files changed, 3 insertions, 8 deletions
diff --git a/meta/recipes-devtools/rust/rust_1.86.0.bb b/meta/recipes-devtools/rust/rust_1.86.0.bb
index c2443fbb15..b13ec116be 100644
--- a/meta/recipes-devtools/rust/rust_1.86.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.86.0.bb
@@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=11a3899825f4376896e438c8c753f8dc"
7inherit rust 7inherit rust
8inherit cargo_common 8inherit cargo_common
9 9
10DEPENDS += "rust-llvm pkgconfig-native openssl ninja-native" 10DEPENDS += "rust-llvm"
11# native rust uses cargo/rustc from binary snapshots to bootstrap 11# native rust uses cargo/rustc from binary snapshots to bootstrap
12# but everything else should use our native builds 12# but everything else should use our native builds
13DEPENDS:append:class-target = " cargo-native rust-native" 13DEPENDS:append:class-target = " cargo-native rust-native"
14DEPENDS:append:class-nativesdk = " cargo-native rust-native" 14DEPENDS:append:class-nativesdk = " cargo-native rust-native"
15 15
16RDEPENDS:${PN}:append:class-target = " gcc g++ binutils bash" 16RDEPENDS:${PN}:append:class-target = " gcc g++ binutils"
17 17
18# Otherwise we'll depend on what we provide 18# Otherwise we'll depend on what we provide
19INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" 19INHIBIT_DEFAULT_RUST_DEPS:class-native = "1"
@@ -237,11 +237,10 @@ do_test_compile () {
237 237
238ALLOW_EMPTY:${PN} = "1" 238ALLOW_EMPTY:${PN} = "1"
239 239
240PACKAGES =+ "${PN}-rustdoc ${PN}-tools-clippy ${PN}-tools-rustfmt ${PN}-zsh-completion" 240PACKAGES =+ "${PN}-rustdoc ${PN}-tools-clippy ${PN}-tools-rustfmt"
241FILES:${PN}-rustdoc = "${bindir}/rustdoc" 241FILES:${PN}-rustdoc = "${bindir}/rustdoc"
242FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver" 242FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver"
243FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt" 243FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt"
244FILES:${PN}-zsh-completion = "${datadir}/zsh"
245 244
246RDEPENDS:${PN}-rustdoc = "${PN}" 245RDEPENDS:${PN}-rustdoc = "${PN}"
247RDEPENDS:${PN}-tools-clippy = "${PN}" 246RDEPENDS:${PN}-tools-clippy = "${PN}"
@@ -258,10 +257,6 @@ rust_do_install() {
258 rust_runx install 257 rust_runx install
259} 258}
260 259
261rust_do_install:append:class-native () {
262 rm -f ${D}${bindir}/cargo
263}
264
265rust_do_install:class-nativesdk() { 260rust_do_install:class-nativesdk() {
266 export PSEUDO_UNLOAD=1 261 export PSEUDO_UNLOAD=1
267 rust_runx install 262 rust_runx install