diff options
| author | Yash Shinde <Yash.Shinde@windriver.com> | 2025-06-25 03:20:12 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-26 11:02:34 +0100 |
| commit | 6f39c76f60d5899f1d79fea5f14e415a90ab9485 (patch) | |
| tree | ae09e648d7082b53af4dfcf66069c8b06c6d9ea9 /meta | |
| parent | a582977bbc22bbe63e7239368791e464e51b750b (diff) | |
| download | poky-6f39c76f60d5899f1d79fea5f14e415a90ab9485.tar.gz | |
rust: Drop obsolete rust-lld and extended tools dependencies
Some dependencies introduced during the v1.86 upgrade
were needed only for rust-lld and certain LLVM extended tools,
not for the Rust compiler itself.
Since rust-lld and the extended tools are now disabled, these
dependencies have become obsolete. Additionally, related tasks
such as packaging zsh files and removing cargo binaries are no longer relevant.
They can be re-enabled later if needed.
(From OE-Core rev: 42141da566c9512b338900967e7e81e9e8b49150)
Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/rust/rust_1.86.0.bb | 11 |
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" | |||
| 7 | inherit rust | 7 | inherit rust |
| 8 | inherit cargo_common | 8 | inherit cargo_common |
| 9 | 9 | ||
| 10 | DEPENDS += "rust-llvm pkgconfig-native openssl ninja-native" | 10 | DEPENDS += "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 |
| 13 | DEPENDS:append:class-target = " cargo-native rust-native" | 13 | DEPENDS:append:class-target = " cargo-native rust-native" |
| 14 | DEPENDS:append:class-nativesdk = " cargo-native rust-native" | 14 | DEPENDS:append:class-nativesdk = " cargo-native rust-native" |
| 15 | 15 | ||
| 16 | RDEPENDS:${PN}:append:class-target = " gcc g++ binutils bash" | 16 | RDEPENDS:${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 |
| 19 | INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" | 19 | INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" |
| @@ -237,11 +237,10 @@ do_test_compile () { | |||
| 237 | 237 | ||
| 238 | ALLOW_EMPTY:${PN} = "1" | 238 | ALLOW_EMPTY:${PN} = "1" |
| 239 | 239 | ||
| 240 | PACKAGES =+ "${PN}-rustdoc ${PN}-tools-clippy ${PN}-tools-rustfmt ${PN}-zsh-completion" | 240 | PACKAGES =+ "${PN}-rustdoc ${PN}-tools-clippy ${PN}-tools-rustfmt" |
| 241 | FILES:${PN}-rustdoc = "${bindir}/rustdoc" | 241 | FILES:${PN}-rustdoc = "${bindir}/rustdoc" |
| 242 | FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver" | 242 | FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver" |
| 243 | FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt" | 243 | FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt" |
| 244 | FILES:${PN}-zsh-completion = "${datadir}/zsh" | ||
| 245 | 244 | ||
| 246 | RDEPENDS:${PN}-rustdoc = "${PN}" | 245 | RDEPENDS:${PN}-rustdoc = "${PN}" |
| 247 | RDEPENDS:${PN}-tools-clippy = "${PN}" | 246 | RDEPENDS:${PN}-tools-clippy = "${PN}" |
| @@ -258,10 +257,6 @@ rust_do_install() { | |||
| 258 | rust_runx install | 257 | rust_runx install |
| 259 | } | 258 | } |
| 260 | 259 | ||
| 261 | rust_do_install:append:class-native () { | ||
| 262 | rm -f ${D}${bindir}/cargo | ||
| 263 | } | ||
| 264 | |||
| 265 | rust_do_install:class-nativesdk() { | 260 | rust_do_install:class-nativesdk() { |
| 266 | export PSEUDO_UNLOAD=1 | 261 | export PSEUDO_UNLOAD=1 |
| 267 | rust_runx install | 262 | rust_runx install |
