From 0e2747db1cdea3afbdd83879e52466eb0fa80890 Mon Sep 17 00:00:00 2001 From: gordonwwang Date: Mon, 15 Jun 2026 19:01:43 +0800 Subject: [PATCH 1/3] Upgrade to 1.95.0 --- 0001-Use-lld-provided-by-system.patch | 10 +++++----- rust.spec | 12 ++++++++---- rustc-1.76.0-unbundle-sqlite.patch | 15 +++++++-------- sources | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch index 97983e8..ba02b28 100644 --- a/0001-Use-lld-provided-by-system.patch +++ b/0001-Use-lld-provided-by-system.patch @@ -1,4 +1,4 @@ -From d2fa68624463426e82f2ba19703159a46867384b Mon Sep 17 00:00:00 2001 +From d8b00ced0429722016cd35c2c5f392cd2b19d440 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 16 Aug 2024 10:12:58 -0700 Subject: [PATCH] Use lld provided by system @@ -50,7 +50,7 @@ index e2c1888e408..4869f85d1e6 100644 Target { llvm_target: "aarch64-unknown-windows".into(), diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs -index 520a59d6a6f..1606618b683 100644 +index 0afe7a0b68b..4671032a437 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs @@ -19,7 +19,7 @@ pub(crate) fn target() -> Target { @@ -59,11 +59,11 @@ index 520a59d6a6f..1606618b683 100644 linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), - linker: Some("rust-lld".into()), + linker: Some("lld".into()), - rustc_abi: Some(RustcAbi::X86Softfloat), + rustc_abi: Some(RustcAbi::Softfloat), features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(), supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS, diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs -index 8a494d0e56d..d2f4f3f42b4 100644 +index 333e20bd0ac..16bea38887b 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs @@ -15,6 +15,7 @@ pub(crate) fn target() -> Target { @@ -75,4 +75,4 @@ index 8a494d0e56d..d2f4f3f42b4 100644 // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to // enable these CPU features explicitly before their first use, otherwise their instructions -- -2.51.1 +2.53.0 diff --git a/rust.spec b/rust.spec index 88ab365..c1d7cca 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ # bootstrap from scratch, set the channel and date from src/stage0.json -%global bootstrap_version 1.93.0 -%global bootstrap_channel 1.93.0 -%global bootstrap_date 2026-01-22 +%global bootstrap_version 1.94.0 +%global bootstrap_channel 1.94.0 +%global bootstrap_date 2026-03-05 # only the specified arch will use the bootstrap binary # run spectool -g rust.spec to get the tarball. @@ -118,7 +118,7 @@ end} Summary: The Rust Programming Language Name: rust -Version: 1.94.0 +Version: 1.95.0 Release: 1%{?dist} License: (ASL 2.0 or MIT) and (BSD and MIT) URL: https://www.rust-lang.org @@ -621,6 +621,10 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %{rustlibdir}/src %changelog +* Mon Jun 15 2026 Wang Guodong - 1.95.0-1 +- [Type] enhancement +- [DESC] Upgrade to 1.95.0 + * Thu Jun 11 2026 Wang Guodong - 1.94.0-1 - [Type] enhancement - [DESC] Upgrade to 1.94.0 diff --git a/rustc-1.76.0-unbundle-sqlite.patch b/rustc-1.76.0-unbundle-sqlite.patch index 6a97138..53750f4 100644 --- a/rustc-1.76.0-unbundle-sqlite.patch +++ b/rustc-1.76.0-unbundle-sqlite.patch @@ -1,8 +1,7 @@ - diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2026-01-24 22:38:02.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-01-27 13:20:44.594573906 -0800 -@@ -2807,7 +2807,6 @@ version = "0.36.0" +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2026-03-25 08:58:07.789728719 -0500 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-03-24 17:34:11.025842497 -0500 +@@ -2824,7 +2824,6 @@ version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b4103cffefa72eb8428cb6b47d6627161e51c2739fc5e3b734584157bc642a" dependencies = [ @@ -11,9 +10,9 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "vcpkg", ] diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2026-01-24 22:38:02.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-01-27 13:20:38.024949181 -0800 -@@ -82,7 +82,7 @@ proptest = "1.9.0" +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2026-03-25 08:54:36.103702972 -0500 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-03-25 08:56:07.916420965 -0500 +@@ -83,7 +83,7 @@ proptest = "1.9.0" pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } rand = "0.9.2" regex = "1.12.2" @@ -21,4 +20,4 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools +rusqlite = { version = "0.38.0", features = [] } rustc-hash = "2.1.1" rustc-stable-hash = "0.1.2" - rustfix = { version = "0.9.2", path = "crates/rustfix" } + rustfix = { version = "0.9.5", path = "crates/rustfix" } diff --git a/sources b/sources index debdf22..f070408 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustc-1.94.0-src.tar.xz) = 8397fa68055827363bff5a1dd228a05e4c4ca5a179d072ecc1b330a874c183529cb9346ec9c531fb3f066b7b6094fc8711d7c341a49755af7b50d63bf0ecff2b +SHA512 (rustc-1.95.0-src.tar.xz) = 685912ffff97063e55c85b2d15d06ba734980cef4b6e104caae1ea433958b12a8d651b757eef7b9f5b06dad3c246d819a5ee5574a26e05007ecdd378f0f041d0 -- Gitee From aab9fef0d743b9d1b4c9b59e2e2285620abdfd14 Mon Sep 17 00:00:00 2001 From: gordonwwang Date: Tue, 16 Jun 2026 13:28:46 +0800 Subject: [PATCH 2/3] avoid the failure of empty debugsourcefiles.list --- rust.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rust.spec b/rust.spec index c1d7cca..1802f45 100644 --- a/rust.spec +++ b/rust.spec @@ -79,6 +79,8 @@ end} %global reduced_debuginfo 1 %if 0%{?reduced_debuginfo} +# avoid the failure of empty debugsourcefiles.list +%undefine _debugsource_packages %global enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2 %global enable_rust_opts --set rust.codegen-units-std=1 %define _lto_cflags %{nil} @@ -624,6 +626,7 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" * Mon Jun 15 2026 Wang Guodong - 1.95.0-1 - [Type] enhancement - [DESC] Upgrade to 1.95.0 +- set _debugsource_packages to avoid the failure of empty debugsourcefiles.list * Thu Jun 11 2026 Wang Guodong - 1.94.0-1 - [Type] enhancement -- Gitee From e20b83a03614ad0eb9d79df7188a0fb3049d27d5 Mon Sep 17 00:00:00 2001 From: gordonwwang Date: Wed, 17 Jun 2026 00:32:09 +0800 Subject: [PATCH 3/3] skip upstream test, no space left on koji device --- rust.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index 1802f45..ebc0343 100644 --- a/rust.spec +++ b/rust.spec @@ -21,6 +21,8 @@ %global bundled_llvm_version 21.1.8 %bcond_without bundled_llvm %bcond_with llvm_static +# skip upstream tests, because it causes 'No space left on device' +%bcond_without skip_upstream_tests %{lua: function rust_triple(arch) if arch == "ppc64le" then @@ -516,13 +518,15 @@ TMP_HELLO=$(mktemp -d) ) rm -rf "$TMP_HELLO" +# not re-running upstream tests, because it causes 'No space left on device' +%if %{without skip_upstream_tests} # Bootstrap is excluded because a lot of its tests are geared toward the upstream CI. %{__python3} ./x.py test --no-fail-fast --skip={src/bootstrap,tests/crashes} || : rm -rf "./build/%{rust_triple}/test/" %ifarch aarch64 -# see https://github.com/rust-lang/rust/issues/123733 -%define cargo_test_skip --test-args "--skip panic_abort_doc_tests" +# see https://github.com/rust-lang/rust/issues/123733 +%define cargo_test_skip --test-args "--skip panic_abort_doc_tests" %endif %{__python3} ./x.py test --no-fail-fast cargo %{?cargo_test_skip} || : rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" @@ -532,6 +536,7 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %{__python3} ./x.py test --no-fail-fast rust-analyzer || : %{__python3} ./x.py test --no-fail-fast rustfmt || : +%endif %files %license COPYRIGHT LICENSE-APACHE LICENSE-MIT @@ -627,6 +632,7 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" - [Type] enhancement - [DESC] Upgrade to 1.95.0 - set _debugsource_packages to avoid the failure of empty debugsourcefiles.list +- skip upstream tests, not re-run * Thu Jun 11 2026 Wang Guodong - 1.94.0-1 - [Type] enhancement -- Gitee