diff options
| author | Yash Shinde <Yash.Shinde@windriver.com> | 2025-03-30 22:54:22 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-01 22:08:36 +0100 |
| commit | 09d8efe144c2dc91a81a57f7c168129dd391b9a3 (patch) | |
| tree | fb068f392e1fbcedc9ecf91a0ca6110b751d33c0 /meta/recipes-devtools | |
| parent | bac7bb5b7ad4bc45480fc5c6a687b0d2dcf1485e (diff) | |
| download | poky-09d8efe144c2dc91a81a57f7c168129dd391b9a3.tar.gz | |
rust: Upgrade 1.85.0->1.85.1
Rust stable version updated to 1.85.1
https://blog.rust-lang.org/2025/03/18/Rust-1.85.1.html
Dropped patches:
downgrade-bootstrap-cc.patch since it's merged with v1.85.1.
(From OE-Core rev: b141115b9c8e052df096e55d92972b1db4c84f4e)
Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/rust/cargo_1.85.1.bb (renamed from meta/recipes-devtools/rust/cargo_1.85.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/libstd-rs_1.85.1.bb (renamed from meta/recipes-devtools/rust/libstd-rs_1.85.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/rust-cross-canadian_1.85.1.bb (renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.85.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/rust-llvm_1.85.1.bb (renamed from meta/recipes-devtools/rust/rust-llvm_1.85.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/rust-source.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/rust_1.85.1.bb (renamed from meta/recipes-devtools/rust/rust_1.85.0.bb) | 0 |
7 files changed, 1 insertions, 43 deletions
diff --git a/meta/recipes-devtools/rust/cargo_1.85.0.bb b/meta/recipes-devtools/rust/cargo_1.85.1.bb index db18ecfda9..db18ecfda9 100644 --- a/meta/recipes-devtools/rust/cargo_1.85.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.85.1.bb | |||
diff --git a/meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch b/meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch deleted file mode 100644 index 3ae68720f9..0000000000 --- a/meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | Downgrade bootstrap cc version | ||
| 2 | |||
| 3 | In rust v1.85.0, the upgraded cc version causes bootstrap | ||
| 4 | to fail on custom targets. Downgrading the cc version fixes | ||
| 5 | the error. This commit is merged with v1.85.1 and the patch | ||
| 6 | can be dropped when upgraded to it. | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7] | ||
| 9 | |||
| 10 | Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> | ||
| 11 | diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock | ||
| 12 | index a47f3af60cb..890e64e2bab 100644 | ||
| 13 | --- a/src/bootstrap/Cargo.lock | ||
| 14 | +++ b/src/bootstrap/Cargo.lock | ||
| 15 | @@ -88,9 +88,9 @@ dependencies = [ | ||
| 16 | |||
| 17 | [[package]] | ||
| 18 | name = "cc" | ||
| 19 | -version = "1.2.0" | ||
| 20 | +version = "1.1.22" | ||
| 21 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 22 | -checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8" | ||
| 23 | +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" | ||
| 24 | dependencies = [ | ||
| 25 | "shlex", | ||
| 26 | ] | ||
| 27 | diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml | ||
| 28 | index ed51862390d..2c1d85b01e6 100644 | ||
| 29 | --- a/src/bootstrap/Cargo.toml | ||
| 30 | +++ b/src/bootstrap/Cargo.toml | ||
| 31 | @@ -37,7 +37,9 @@ test = false | ||
| 32 | # Most of the time updating these dependencies requires modifications to the | ||
| 33 | # bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565); | ||
| 34 | # otherwise, some targets will fail. That's why these dependencies are explicitly pinned. | ||
| 35 | -cc = "=1.2.0" | ||
| 36 | +# | ||
| 37 | +# Do not upgrade this crate unless https://github.com/rust-lang/cc-rs/issues/1317 is fixed. | ||
| 38 | +cc = "=1.1.22" | ||
| 39 | cmake = "=0.1.48" | ||
| 40 | |||
| 41 | build_helper = { path = "../build_helper" } | ||
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.85.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.85.1.bb index 1994368812..1994368812 100644 --- a/meta/recipes-devtools/rust/libstd-rs_1.85.0.bb +++ b/meta/recipes-devtools/rust/libstd-rs_1.85.1.bb | |||
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.85.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.85.1.bb index 55865238ab..55865238ab 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian_1.85.0.bb +++ b/meta/recipes-devtools/rust/rust-cross-canadian_1.85.1.bb | |||
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.85.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.85.1.bb index 566348c617..566348c617 100644 --- a/meta/recipes-devtools/rust/rust-llvm_1.85.0.bb +++ b/meta/recipes-devtools/rust/rust-llvm_1.85.1.bb | |||
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index e07055882c..8400a4875d 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc | |||
| @@ -8,9 +8,8 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n | |||
| 8 | file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \ | 8 | file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \ |
| 9 | file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \ | 9 | file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \ |
| 10 | file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \ | 10 | file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \ |
| 11 | file://downgrade-bootstrap-cc.patch;patchdir=${RUSTSRC} \ | ||
| 12 | " | 11 | " |
| 13 | SRC_URI[rust.sha256sum] = "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7" | 12 | SRC_URI[rust.sha256sum] = "b1fbf809efe9f036939401e142631c201a53bcf43ec1696bd9f5290ba236a266" |
| 14 | 13 | ||
| 15 | RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" | 14 | RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" |
| 16 | 15 | ||
diff --git a/meta/recipes-devtools/rust/rust_1.85.0.bb b/meta/recipes-devtools/rust/rust_1.85.1.bb index dc4f564855..dc4f564855 100644 --- a/meta/recipes-devtools/rust/rust_1.85.0.bb +++ b/meta/recipes-devtools/rust/rust_1.85.1.bb | |||
