mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
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>
This commit is contained in:
parent
bac7bb5b7a
commit
09d8efe144
|
@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
|
|||
GCCVERSION ?= "14.%"
|
||||
SDKGCCVERSION ?= "${GCCVERSION}"
|
||||
GLIBCVERSION ?= "2.41%"
|
||||
RUSTVERSION ?= "1.85.0%"
|
||||
RUSTVERSION ?= "1.85.1%"
|
||||
|
||||
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
|
||||
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
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" }
|
|
@ -8,9 +8,8 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
|
|||
file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \
|
||||
file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \
|
||||
file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \
|
||||
file://downgrade-bootstrap-cc.patch;patchdir=${RUSTSRC} \
|
||||
"
|
||||
SRC_URI[rust.sha256sum] = "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7"
|
||||
SRC_URI[rust.sha256sum] = "b1fbf809efe9f036939401e142631c201a53bcf43ec1696bd9f5290ba236a266"
|
||||
|
||||
RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user