mirror of
https://git.yoctoproject.org/poky
synced 2026-06-18 18:49:51 +00:00
Yash Shinde
bac7bb5b7a
Rust stable version updated to 1.85.0 https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html Some of the major updates: - Update LIC_FILES_CHKSUM in libstd-rs and rust recipes. License-Update: Unicode license text is updated to Unicode-3.0 License. https://github.com/rust-lang/rust/commit/6d2a3e9786ec43a0e0af20386e7046328296ac86 [RP: Update LICENSE to reference Unicode-3.0] - Pass '-Zforce-unstable-if-unmarked' to RUSTFLAGS in libstd-rs.bb Fix: https://github.com/rust-lang/rust/issues/133857#issuecomment-2526341227 - Downgrade bootstrap cc version causing bootstrap to fail on custom targets. (Backported from v1.85.1) Fix: https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7 - Explicitly set float ABI for all ARM 32 bits targets. Fix: https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905 - Rust v1.85.0 tarball doesn't ship gcc tree. Drop "remove_gcc_directory" postfunc which removed it and prevented the bloat. Fix: https://github.com/rust-lang/rust/commit/13c3f9b9498013837782b46120085ea19ca75518 Adapted the patch changes with v1.85.0: repro-issue-fix-with-cc-crate-hashmap.patch revert-link-std-statically-in-rustc_driver-feature.patch rust-oe-selftest.patch rv32-cargo-rustix-0.38.40-fix.patch Dropped patches: fix-tidy-check-failure.patch since it's merged with v1.85.0. (From OE-Core rev: 3130069fdebb92f20b962fa8074564a27c3fb6b9) Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
Downgrade bootstrap cc version
|
|
|
|
In rust v1.85.0, the upgraded cc version causes bootstrap
|
|
to fail on custom targets. Downgrading the cc version fixes
|
|
the error. This commit is merged with v1.85.1 and the patch
|
|
can be dropped when upgraded to it.
|
|
|
|
Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7]
|
|
|
|
Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
|
|
diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
|
|
index a47f3af60cb..890e64e2bab 100644
|
|
--- a/src/bootstrap/Cargo.lock
|
|
+++ b/src/bootstrap/Cargo.lock
|
|
@@ -88,9 +88,9 @@ dependencies = [
|
|
|
|
[[package]]
|
|
name = "cc"
|
|
-version = "1.2.0"
|
|
+version = "1.1.22"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
|
|
+checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
|
|
dependencies = [
|
|
"shlex",
|
|
]
|
|
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
|
|
index ed51862390d..2c1d85b01e6 100644
|
|
--- a/src/bootstrap/Cargo.toml
|
|
+++ b/src/bootstrap/Cargo.toml
|
|
@@ -37,7 +37,9 @@ test = false
|
|
# Most of the time updating these dependencies requires modifications to the
|
|
# bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
|
|
# otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
|
|
-cc = "=1.2.0"
|
|
+#
|
|
+# Do not upgrade this crate unless https://github.com/rust-lang/cc-rs/issues/1317 is fixed.
|
|
+cc = "=1.1.22"
|
|
cmake = "=0.1.48"
|
|
|
|
build_helper = { path = "../build_helper" }
|