From e72fdb8f2a5e1ccdbcbde5576d5dc0bf5aba9a2b Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 29 Apr 2025 14:41:30 -0700 Subject: [PATCH 1/6] Update to Rust 1.85.0 Resolves: RHEL-81602 Resolves: RHEL-81623 --- .gitignore | 1 + ...llow-disabling-target-self-contained.patch | 24 +++---- ...xternal-library-path-for-wasm32-wasi.patch | 63 ++++++++++--------- rust.spec | 33 ++++++---- ...atch => rustc-1.85.0-disable-libssh2.patch | 14 ++--- ...atch => rustc-1.85.0-unbundle-sqlite.patch | 12 ++-- sources | 2 +- 7 files changed, 81 insertions(+), 68 deletions(-) rename rustc-1.84.0-disable-libssh2.patch => rustc-1.85.0-disable-libssh2.patch (66%) rename rustc-1.84.0-unbundle-sqlite.patch => rustc-1.85.0-unbundle-sqlite.patch (64%) diff --git a/.gitignore b/.gitignore index 3e27193..0de3fa4 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ SOURCES/wasi-libc-wasi-sdk-17.tar.gz /rustc-1.84.0-src.tar.xz /wasi-libc-wasi-sdk-25.tar.gz /rustc-1.84.1-src.tar.xz +/rustc-1.85.0-src.tar.xz diff --git a/0001-bootstrap-allow-disabling-target-self-contained.patch b/0001-bootstrap-allow-disabling-target-self-contained.patch index 34d735d..bd6d0ed 100644 --- a/0001-bootstrap-allow-disabling-target-self-contained.patch +++ b/0001-bootstrap-allow-disabling-target-self-contained.patch @@ -1,4 +1,4 @@ -From 8d4d52446347872816ab51958e9f3162cf722ee6 Mon Sep 17 00:00:00 2001 +From eeb171e5de6da8790d01135754cbb9b6c248c476 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 28 Sep 2023 18:14:28 -0700 Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained @@ -11,10 +11,10 @@ Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained 4 files changed, 22 insertions(+) diff --git a/config.example.toml b/config.example.toml -index d3233ad17b51..6a1f097c20cb 100644 +index 5ea6774ce035..ec08a319e77f 100644 --- a/config.example.toml +++ b/config.example.toml -@@ -916,6 +916,11 @@ +@@ -922,6 +922,11 @@ # argument as the test binary. #runner = (string) @@ -27,10 +27,10 @@ index d3233ad17b51..6a1f097c20cb 100644 # Distribution options # diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs -index 8e088682f92d..843b7123b120 100644 +index ca337aa9f4c3..6175f93e50ed 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs -@@ -346,6 +346,10 @@ fn copy_self_contained_objects( +@@ -325,6 +325,10 @@ fn copy_self_contained_objects( compiler: &Compiler, target: TargetSelection, ) -> Vec<(PathBuf, DependencyType)> { @@ -42,10 +42,10 @@ index 8e088682f92d..843b7123b120 100644 builder.sysroot_target_libdir(*compiler, target).join("self-contained"); t!(fs::create_dir_all(&libdir_self_contained)); diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs -index e706aba977b6..a55d98e94dd8 100644 +index dd2f11ad4690..e10ed666099c 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs -@@ -627,6 +627,7 @@ pub struct Target { +@@ -634,6 +634,7 @@ pub struct Target { pub runner: Option, pub no_std: bool, pub codegen_backends: Option>, @@ -53,7 +53,7 @@ index e706aba977b6..a55d98e94dd8 100644 } impl Target { -@@ -638,6 +639,9 @@ pub fn from_triple(triple: &str) -> Self { +@@ -645,6 +646,9 @@ pub fn from_triple(triple: &str) -> Self { if triple.contains("emscripten") { target.runner = Some("node".into()); } @@ -63,7 +63,7 @@ index e706aba977b6..a55d98e94dd8 100644 target } } -@@ -1213,6 +1217,7 @@ struct TomlTarget { +@@ -1219,6 +1223,7 @@ struct TomlTarget { no_std: Option = "no-std", codegen_backends: Option> = "codegen-backends", runner: Option = "runner", @@ -71,7 +71,7 @@ index e706aba977b6..a55d98e94dd8 100644 } } -@@ -2038,6 +2043,9 @@ fn get_table(option: &str) -> Result { +@@ -2082,6 +2087,9 @@ fn get_table(option: &str) -> Result { if let Some(s) = cfg.no_std { target.no_std = s; } @@ -82,10 +82,10 @@ index e706aba977b6..a55d98e94dd8 100644 target.cxx = cfg.cxx.map(PathBuf::from); target.ar = cfg.ar.map(PathBuf::from); diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs -index c384fd6bf435..a101c010b740 100644 +index 8405c22aff08..7e1582207b8a 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs -@@ -1351,6 +1351,11 @@ fn no_std(&self, target: TargetSelection) -> Option { +@@ -1327,6 +1327,11 @@ fn no_std(&self, target: TargetSelection) -> Option { self.config.target_config.get(&target).map(|t| t.no_std) } diff --git a/0002-set-an-external-library-path-for-wasm32-wasi.patch b/0002-set-an-external-library-path-for-wasm32-wasi.patch index 3a05424..3534abb 100644 --- a/0002-set-an-external-library-path-for-wasm32-wasi.patch +++ b/0002-set-an-external-library-path-for-wasm32-wasi.patch @@ -1,19 +1,20 @@ -From 21d53eca2af5f04c0aa6b898f99f58e0e093cfdd Mon Sep 17 00:00:00 2001 +From e8e50258df70b39d2425dacf90c3d5f6d0720bc0 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 28 Sep 2023 18:18:16 -0700 Subject: [PATCH 2/2] set an external library path for wasm32-wasi --- compiler/rustc_codegen_ssa/src/back/link.rs | 10 ++++++++++ - compiler/rustc_target/src/spec/mod.rs | 4 ++++ + compiler/rustc_target/src/spec/json.rs | 2 ++ + compiler/rustc_target/src/spec/mod.rs | 2 ++ .../rustc_target/src/spec/targets/wasm32_wasip1.rs | 7 ++++--- - 3 files changed, 18 insertions(+), 3 deletions(-) + 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index 5149e3a12f23..cf62fbdc7f59 100644 +index e2081ad75633..a308bae8b644 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -1663,6 +1663,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat +@@ -1639,6 +1639,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat return file_path; } } @@ -26,7 +27,7 @@ index 5149e3a12f23..cf62fbdc7f59 100644 for search_path in sess.target_filesearch().search_paths(PathKind::Native) { let file_path = search_path.dir.join(name); if file_path.exists() { -@@ -2163,6 +2169,10 @@ fn add_library_search_dirs( +@@ -2139,6 +2145,10 @@ fn add_library_search_dirs( ControlFlow::<()>::Continue(()) }, ); @@ -37,27 +38,11 @@ index 5149e3a12f23..cf62fbdc7f59 100644 } /// Add options making relocation sections in the produced ELF files read-only -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index 321ab40403a3..54791c8892d8 100644 ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -2155,6 +2155,7 @@ pub struct TargetOptions { - /// Objects to link before and after all other object code. - pub pre_link_objects: CrtObjects, - pub post_link_objects: CrtObjects, -+ pub external_lib_path: Option>, - /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled. - pub pre_link_objects_self_contained: CrtObjects, - pub post_link_objects_self_contained: CrtObjects, -@@ -2651,6 +2652,7 @@ fn default() -> TargetOptions { - relro_level: RelroLevel::None, - pre_link_objects: Default::default(), - post_link_objects: Default::default(), -+ external_lib_path: None, - pre_link_objects_self_contained: Default::default(), - post_link_objects_self_contained: Default::default(), - link_self_contained: LinkSelfContainedDefault::False, -@@ -3355,6 +3357,7 @@ macro_rules! key { +diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs +index 9cdc0801b1f0..70fe8396b353 100644 +--- a/compiler/rustc_target/src/spec/json.rs ++++ b/compiler/rustc_target/src/spec/json.rs +@@ -527,6 +527,7 @@ macro_rules! key { key!(linker_is_gnu_json = "linker-is-gnu", bool); key!(pre_link_objects = "pre-link-objects", link_objects); key!(post_link_objects = "post-link-objects", link_objects); @@ -65,7 +50,7 @@ index 321ab40403a3..54791c8892d8 100644 key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects); key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects); // Deserializes the backwards-compatible variants of `-Clink-self-contained` -@@ -3636,6 +3639,7 @@ macro_rules! target_option_val { +@@ -708,6 +709,7 @@ macro_rules! target_option_val { target_option_val!(linker_is_gnu_json, "linker-is-gnu"); target_option_val!(pre_link_objects); target_option_val!(post_link_objects); @@ -73,8 +58,28 @@ index 321ab40403a3..54791c8892d8 100644 target_option_val!(pre_link_objects_self_contained, "pre-link-objects-fallback"); target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback"); target_option_val!(link_args - pre_link_args_json, "pre-link-args"); +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index 02962d55a60e..169f5a74bbfd 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -2197,6 +2197,7 @@ pub struct TargetOptions { + /// Objects to link before and after all other object code. + pub pre_link_objects: CrtObjects, + pub post_link_objects: CrtObjects, ++ pub external_lib_path: Option>, + /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled. + pub pre_link_objects_self_contained: CrtObjects, + pub post_link_objects_self_contained: CrtObjects, +@@ -2712,6 +2713,7 @@ fn default() -> TargetOptions { + relro_level: RelroLevel::None, + pre_link_objects: Default::default(), + post_link_objects: Default::default(), ++ external_lib_path: None, + pre_link_objects_self_contained: Default::default(), + post_link_objects_self_contained: Default::default(), + link_self_contained: LinkSelfContainedDefault::False, diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs -index 1cd30f21bec1..9a752d5712a6 100644 +index 0862958d05da..b1e736d68627 100644 --- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs +++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs @@ -19,11 +19,12 @@ pub(crate) fn target() -> Target { diff --git a/rust.spec b/rust.spec index ce22a3e..ebf3d6f 100644 --- a/rust.spec +++ b/rust.spec @@ -1,8 +1,8 @@ Name: rust -Version: 1.84.1 +Version: 1.85.0 Release: 1%{?dist} Summary: The Rust Programming Language -License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016) +License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0) # ^ written as: (rust itself) and (bundled libraries) URL: https://www.rust-lang.org @@ -14,9 +14,9 @@ ExclusiveArch: %{rust_arches} # To bootstrap from scratch, set the channel and date from src/stage0.json # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13 # or nightly wants some beta-YYYY-MM-DD -%global bootstrap_version 1.83.0 -%global bootstrap_channel 1.83.0 -%global bootstrap_date 2024-11-28 +%global bootstrap_version 1.84.0 +%global bootstrap_channel 1.84.0 +%global bootstrap_date 2025-01-09 # Only the specified arches will use bootstrap binaries. # NOTE: Those binaries used to be uploaded with every new release, but that was @@ -44,8 +44,8 @@ ExclusiveArch: %{rust_arches} # We can also choose to just use Rust's bundled LLVM, in case the system LLVM # is insufficient. Rust currently requires LLVM 18.0+. %global min_llvm_version 18.0.0 -%global bundled_llvm_version 19.1.5 -#global llvm_compat_version 17 +%global bundled_llvm_version 19.1.7 +#global llvm_compat_version 18 %global llvm llvm%{?llvm_compat_version} %bcond_with bundled_llvm @@ -112,7 +112,7 @@ ExclusiveArch: %{rust_arches} # Detect non-stable channels from the version, like 1.74.0~beta.1 %{lua: do local version = rpm.expand("%{version}") - local version_channel, subs = string.gsub(version, "^.*~(%w+).*$", "%1", 1) + local version_channel, subs = version:gsub("^.*~(%w+).*$", "%1", 1) rpm.define("channel " .. (subs ~= 0 and version_channel or "stable")) rpm.define("rustc_package rustc-" .. version_channel .. "-src") end} @@ -137,7 +137,7 @@ Patch4: 0001-bootstrap-allow-disabling-target-self-contained.patch Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch # We don't want to use the bundled library in libsqlite3-sys -Patch6: rustc-1.84.0-unbundle-sqlite.patch +Patch6: rustc-1.85.0-unbundle-sqlite.patch # https://github.com/rust-lang/cc-rs/issues/1354 Patch7: 0001-Only-translate-profile-flags-for-Clang.patch @@ -150,7 +150,7 @@ Source101: cargo_vendor.attr Source102: cargo_vendor.prov # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949) -Patch100: rustc-1.84.0-disable-libssh2.patch +Patch100: rustc-1.85.0-disable-libssh2.patch # Get the Rust triple for any architecture and ABI. %{lua: function rust_triple(arch, abi) @@ -201,7 +201,7 @@ end} %endif %global all_targets %{?mingw_targets} %{?wasm_targets} %{?extra_targets} %define target_enabled() %{lua: - print(string.find(rpm.expand(" %{all_targets} "), rpm.expand(" %1 "), 1, true) or 0) + print(rpm.expand(" %{all_targets} "):find(rpm.expand(" %1 "), 1, true) or 0) } %if %defined bootstrap_arches @@ -209,7 +209,7 @@ end} # Also define bootstrap_source just for the current target. %{lua: do local bootstrap_arches = {} - for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do + for arch in rpm.expand("%{bootstrap_arches}"):gmatch("%S+") do table.insert(bootstrap_arches, arch) end local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}") @@ -648,7 +648,7 @@ rm -rf %{wasi_libc_dir}/dlmalloc/ %if %without bundled_sqlite3 %patch -P6 -p1 %endif -%patch -P7 -p1 -d vendor/cc-1.2.5 +%patch -P7 -p1 -d vendor/cc-1.2.6 %if %with disabled_libssh2 %patch -P100 -p1 @@ -850,6 +850,9 @@ test -r "%{profiler}" %global __x %{__python3} ./x.py +# Skipping PGO on s390x until we get LLVM 20, due to +# https://github.com/llvm/llvm-project/issues/124001 +%ifnarch s390x %if %with rustc_pgo # Build the compiler with profile instrumentation %define profraw $PWD/build/profiles @@ -865,6 +868,7 @@ rm -r "%{profraw}" build/%{rust_triple}/stage2*/ # Redefine the macro to use that profile data from now on %global __x %{__x} --rust-profile-use="%{profdata}" %endif +%endif # Build the compiler normally (with or without PGO) %{__x} build sysroot @@ -1154,6 +1158,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %changelog +* Tue Apr 29 2025 Josh Stone - 1.85.0-1 +- Update to 1.85.0 + * Tue Feb 04 2025 Josh Stone - 1.84.1-1 - Update to 1.84.1 diff --git a/rustc-1.84.0-disable-libssh2.patch b/rustc-1.85.0-disable-libssh2.patch similarity index 66% rename from rustc-1.84.0-disable-libssh2.patch rename to rustc-1.85.0-disable-libssh2.patch index 267bc3c..09be945 100644 --- a/rustc-1.84.0-disable-libssh2.patch +++ b/rustc-1.85.0-disable-libssh2.patch @@ -1,7 +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 2024-12-12 14:07:10.755481543 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-12-12 14:07:10.756481534 -0800 -@@ -2272,7 +2272,6 @@ checksum = "10472326a8a6477c3c20a64547b0 +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-01-17 14:26:49.845587361 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-01-17 14:26:49.848587324 -0800 +@@ -2296,7 +2296,6 @@ checksum = "10472326a8a6477c3c20a64547b0 dependencies = [ "cc", "libc", @@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "libz-sys", "openssl-sys", "pkg-config", -@@ -2313,20 +2312,6 @@ dependencies = [ +@@ -2337,20 +2336,6 @@ dependencies = [ "pkg-config", "vcpkg", ] @@ -31,8 +31,8 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools [[package]] name = "libz-sys" 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 2024-12-12 14:07:10.756481534 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-12-12 14:07:56.866087428 -0800 +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-01-17 14:26:49.848587324 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-01-17 14:27:49.035844397 -0800 @@ -47,7 +47,7 @@ curl = "0.4.46" curl-sys = "0.4.73" filetime = "0.2.23" @@ -40,5 +40,5 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools -git2 = "0.19.0" +git2 = { version = "0.19.0", default-features = false, features = ["https"] } git2-curl = "0.20.0" - gix = { version = "0.67.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } + gix = { version = "0.69.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } glob = "0.3.1" diff --git a/rustc-1.84.0-unbundle-sqlite.patch b/rustc-1.85.0-unbundle-sqlite.patch similarity index 64% rename from rustc-1.84.0-unbundle-sqlite.patch rename to rustc-1.85.0-unbundle-sqlite.patch index 2e3ecc3..08c395f 100644 --- a/rustc-1.84.0-unbundle-sqlite.patch +++ b/rustc-1.85.0-unbundle-sqlite.patch @@ -1,7 +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 2024-12-07 06:47:38.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-12-12 14:02:54.412672539 -0800 -@@ -2310,7 +2310,6 @@ version = "0.30.1" +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-01-11 07:18:58.000000000 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-01-17 14:14:33.072839703 -0800 +@@ -2334,7 +2334,6 @@ version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ @@ -10,8 +10,8 @@ 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 2024-12-12 14:02:54.412672539 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-12-12 14:03:25.665405417 -0800 +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-01-17 14:14:33.072839703 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-01-17 14:15:48.497891366 -0800 @@ -80,7 +80,7 @@ proptest = "1.5.0" pulldown-cmark = { version = "0.12.0", default-features = false, features = ["html"] } rand = "0.8.5" @@ -19,5 +19,5 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools -rusqlite = { version = "0.32.0", features = ["bundled"] } +rusqlite = { version = "0.32.0", features = [] } rustc-hash = "2.0.0" + rustc-stable-hash = "0.1.1" rustfix = { version = "0.9.0", path = "crates/rustfix" } - same-file = "1.0.6" diff --git a/sources b/sources index 24d06bc..b0e42b4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rustc-1.84.1-src.tar.xz) = f1cc4765736551508408126e44086988e8ddc30c1a929bf7b61c6be85ad0d65928dd5fb1041cfaeee8eb37d2208f2c1917e276aef2bc9a8e40e34f6713b349e1 +SHA512 (rustc-1.85.0-src.tar.xz) = 3e9c933d1d9b6e5fb081837cf07eb1638b1a6b4fd1cb607dd860c5021ba7b521edbaf8ba0fa8f182f62178b72a3e1a3e6b26675e8fb6530871137852a074443c SHA512 (wasi-libc-wasi-sdk-25.tar.gz) = 580716fbc152be19e2e9724f3483a0a580a168be0cd6d105d37b0ebd0d11bd36d7d9db63984eb2cc7b3aaff2fc9446d9558d1469b538a79b7de465a1113560ea From 5333776e90e408135c8e82fdd67ae71da561dd73 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 30 Apr 2025 09:15:54 -0700 Subject: [PATCH 2/6] Update to Rust 1.86.0 Resolves: RHEL-81602 Resolves: RHEL-81625 --- .gitignore | 3 + ...ly-translate-profile-flags-for-Clang.patch | 39 ------ 0001-Use-lld-provided-by-system.patch | 24 ++-- ...llow-disabling-target-self-contained.patch | 34 ++--- ...xternal-library-path-for-wasm32-wasi.patch | 22 ++-- rust.spec | 118 ++++++++++++------ rustc-1.85.0-disable-libssh2.patch | 44 ------- rustc-1.85.0-unbundle-sqlite.patch | 23 ---- rustc-1.86.0-disable-libssh2.patch | 44 +++++++ rustc-1.86.0-unbundle-sqlite.patch | 23 ++++ sources | 4 +- 11 files changed, 193 insertions(+), 185 deletions(-) delete mode 100644 0001-Only-translate-profile-flags-for-Clang.patch delete mode 100644 rustc-1.85.0-disable-libssh2.patch delete mode 100644 rustc-1.85.0-unbundle-sqlite.patch create mode 100644 rustc-1.86.0-disable-libssh2.patch create mode 100644 rustc-1.86.0-unbundle-sqlite.patch diff --git a/.gitignore b/.gitignore index 0de3fa4..e23dd23 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ SOURCES/wasi-libc-wasi-sdk-17.tar.gz /wasi-libc-wasi-sdk-25.tar.gz /rustc-1.84.1-src.tar.xz /rustc-1.85.0-src.tar.xz +/rustc-1.85.1-src.tar.xz +/rustc-1.86.0-src.tar.xz +/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz diff --git a/0001-Only-translate-profile-flags-for-Clang.patch b/0001-Only-translate-profile-flags-for-Clang.patch deleted file mode 100644 index 3353c10..0000000 --- a/0001-Only-translate-profile-flags-for-Clang.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e4e678eb9cbd90acf2ba51e9ec0209b05c4403b5 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Thu, 9 Jan 2025 16:47:10 -0800 -Subject: [PATCH] Only translate profile flags for Clang - ---- - src/flags.rs | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/src/flags.rs b/src/flags.rs -index 81834cf625f7..1a53c1b2345c 100644 ---- a/src/flags.rs -+++ b/src/flags.rs -@@ -201,13 +201,15 @@ impl<'this> RustcCodegenFlags<'this> { - if self.no_vectorize_slp { - push_if_supported("-fno-slp-vectorize".into()); - } -- // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate -- if let Some(value) = self.profile_generate { -- push_if_supported(format!("-fprofile-generate={value}").into()); -- } -- // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use -- if let Some(value) = self.profile_use { -- push_if_supported(format!("-fprofile-use={value}").into()); -+ if let ToolFamily::Clang { .. } = family { -+ // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate -+ if let Some(value) = self.profile_generate { -+ push_if_supported(format!("-fprofile-generate={value}").into()); -+ } -+ // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use -+ if let Some(value) = self.profile_use { -+ push_if_supported(format!("-fprofile-use={value}").into()); -+ } - } - // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-mguard - if let Some(value) = self.control_flow_guard { --- -2.47.1 - diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch index 063d66a..63c9b14 100644 --- a/0001-Use-lld-provided-by-system.patch +++ b/0001-Use-lld-provided-by-system.patch @@ -1,4 +1,4 @@ -From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 Mon Sep 17 00:00:00 2001 +From 687112c89c9058ef1e79f1c3a974940b1ae43ea3 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 @@ -12,7 +12,7 @@ Subject: [PATCH] Use lld provided by system 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs -index f237391016e7..08bcd9699b4a 100644 +index 81b96cd39ffa..4c9916af826b 100644 --- a/compiler/rustc_target/src/spec/base/wasm.rs +++ b/compiler/rustc_target/src/spec/base/wasm.rs @@ -85,8 +85,7 @@ macro_rules! args { @@ -26,10 +26,10 @@ index f237391016e7..08bcd9699b4a 100644 pre_link_args, diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs -index 222d5651b521..4b780bc8a8e7 100644 +index 3b719ebaf07e..8b4fecee68f0 100644 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs -@@ -14,7 +14,7 @@ pub fn target() -> Target { +@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target { let opts = TargetOptions { abi: "softfloat".into(), linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), @@ -39,10 +39,10 @@ index 222d5651b521..4b780bc8a8e7 100644 relocation_model: RelocModel::Static, disable_redzone: true, diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs -index 429303170b6b..19d4ec53f6d8 100644 +index 9656024ddaa1..2099fa17229f 100644 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs -@@ -9,6 +9,7 @@ pub fn target() -> Target { +@@ -9,6 +9,7 @@ pub(crate) fn target() -> Target { base.max_atomic_width = Some(128); base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]); base.features = "+v8a".into(); @@ -51,23 +51,23 @@ index 429303170b6b..19d4ec53f6d8 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 549706998d46..b7e9158ddef5 100644 +index e14a36735894..b493d7d98b46 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 -@@ -17,7 +17,7 @@ pub fn target() -> Target { +@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target { static_position_independent_executables: true, relro_level: RelroLevel::Full, linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), - linker: Some("rust-lld".into()), + linker: Some("lld".into()), + rustc_abi: Some(RustcAbi::X86Softfloat), features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(), supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS, - disable_redzone: true, 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 6da1fcca58c8..c84ae44576d4 100644 +index bce6aa0ebc6b..7fa1148a1de7 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 -@@ -16,6 +16,7 @@ pub fn target() -> Target { +@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target { base.plt_by_default = false; base.max_atomic_width = Some(64); base.entry_abi = Conv::X86_64Win64; @@ -76,5 +76,5 @@ index 6da1fcca58c8..c84ae44576d4 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.46.0 +2.48.1 diff --git a/0001-bootstrap-allow-disabling-target-self-contained.patch b/0001-bootstrap-allow-disabling-target-self-contained.patch index bd6d0ed..9ee7b78 100644 --- a/0001-bootstrap-allow-disabling-target-self-contained.patch +++ b/0001-bootstrap-allow-disabling-target-self-contained.patch @@ -1,4 +1,4 @@ -From eeb171e5de6da8790d01135754cbb9b6c248c476 Mon Sep 17 00:00:00 2001 +From c3307f4e1826cabd8e7e4a54636b0e79afb97835 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 28 Sep 2023 18:14:28 -0700 Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained @@ -11,12 +11,12 @@ Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained 4 files changed, 22 insertions(+) diff --git a/config.example.toml b/config.example.toml -index 5ea6774ce035..ec08a319e77f 100644 +index f5395375afe4..a96368ae4ef2 100644 --- a/config.example.toml +++ b/config.example.toml -@@ -922,6 +922,11 @@ - # argument as the test binary. - #runner = (string) +@@ -927,6 +927,11 @@ + # order to run `x check`. + #optimized-compiler-builtins = build.optimized-compiler-builtins (bool) +# Copy libc and CRT objects into the target lib/self-contained/ directory. +# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other @@ -27,10 +27,10 @@ index 5ea6774ce035..ec08a319e77f 100644 # Distribution options # diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs -index ca337aa9f4c3..6175f93e50ed 100644 +index 479327d63695..97d2bf2df8bb 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs -@@ -325,6 +325,10 @@ fn copy_self_contained_objects( +@@ -327,6 +327,10 @@ fn copy_self_contained_objects( compiler: &Compiler, target: TargetSelection, ) -> Vec<(PathBuf, DependencyType)> { @@ -42,18 +42,18 @@ index ca337aa9f4c3..6175f93e50ed 100644 builder.sysroot_target_libdir(*compiler, target).join("self-contained"); t!(fs::create_dir_all(&libdir_self_contained)); diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs -index dd2f11ad4690..e10ed666099c 100644 +index 65f286a05bd5..dc4d6f741bcf 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs -@@ -634,6 +634,7 @@ pub struct Target { - pub runner: Option, +@@ -643,6 +643,7 @@ pub struct Target { pub no_std: bool, pub codegen_backends: Option>, + pub optimized_compiler_builtins: Option, + pub self_contained: bool, } impl Target { -@@ -645,6 +646,9 @@ pub fn from_triple(triple: &str) -> Self { +@@ -654,6 +655,9 @@ pub fn from_triple(triple: &str) -> Self { if triple.contains("emscripten") { target.runner = Some("node".into()); } @@ -63,15 +63,15 @@ index dd2f11ad4690..e10ed666099c 100644 target } } -@@ -1219,6 +1223,7 @@ struct TomlTarget { - no_std: Option = "no-std", +@@ -1234,6 +1238,7 @@ struct TomlTarget { codegen_backends: Option> = "codegen-backends", runner: Option = "runner", + optimized_compiler_builtins: Option = "optimized-compiler-builtins", + self_contained: Option = "self-contained", } } -@@ -2082,6 +2087,9 @@ fn get_table(option: &str) -> Result { +@@ -2146,6 +2151,9 @@ fn get_table(option: &str) -> Result { if let Some(s) = cfg.no_std { target.no_std = s; } @@ -82,10 +82,10 @@ index dd2f11ad4690..e10ed666099c 100644 target.cxx = cfg.cxx.map(PathBuf::from); target.ar = cfg.ar.map(PathBuf::from); diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs -index 8405c22aff08..7e1582207b8a 100644 +index 21b02a3b541a..6b98c67457e8 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs -@@ -1327,6 +1327,11 @@ fn no_std(&self, target: TargetSelection) -> Option { +@@ -1366,6 +1366,11 @@ fn no_std(&self, target: TargetSelection) -> Option { self.config.target_config.get(&target).map(|t| t.no_std) } @@ -98,5 +98,5 @@ index 8405c22aff08..7e1582207b8a 100644 /// and `remote-test-server` binaries. fn remote_tested(&self, target: TargetSelection) -> bool { -- -2.47.1 +2.48.1 diff --git a/0002-set-an-external-library-path-for-wasm32-wasi.patch b/0002-set-an-external-library-path-for-wasm32-wasi.patch index 3534abb..2441d07 100644 --- a/0002-set-an-external-library-path-for-wasm32-wasi.patch +++ b/0002-set-an-external-library-path-for-wasm32-wasi.patch @@ -1,4 +1,4 @@ -From e8e50258df70b39d2425dacf90c3d5f6d0720bc0 Mon Sep 17 00:00:00 2001 +From 9551ffded09131ac225261ab55a7b3c9d09ad3bb Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 28 Sep 2023 18:18:16 -0700 Subject: [PATCH 2/2] set an external library path for wasm32-wasi @@ -11,10 +11,10 @@ Subject: [PATCH 2/2] set an external library path for wasm32-wasi 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index e2081ad75633..a308bae8b644 100644 +index 105a4cb81f0d..21bd626842c7 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -1639,6 +1639,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat +@@ -1686,6 +1686,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat return file_path; } } @@ -27,7 +27,7 @@ index e2081ad75633..a308bae8b644 100644 for search_path in sess.target_filesearch().search_paths(PathKind::Native) { let file_path = search_path.dir.join(name); if file_path.exists() { -@@ -2139,6 +2145,10 @@ fn add_library_search_dirs( +@@ -2186,6 +2192,10 @@ fn add_library_search_dirs( ControlFlow::<()>::Continue(()) }, ); @@ -39,10 +39,10 @@ index e2081ad75633..a308bae8b644 100644 /// Add options making relocation sections in the produced ELF files read-only diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs -index 9cdc0801b1f0..70fe8396b353 100644 +index f703132e51f0..c4821be7d12e 100644 --- a/compiler/rustc_target/src/spec/json.rs +++ b/compiler/rustc_target/src/spec/json.rs -@@ -527,6 +527,7 @@ macro_rules! key { +@@ -540,6 +540,7 @@ macro_rules! key { key!(linker_is_gnu_json = "linker-is-gnu", bool); key!(pre_link_objects = "pre-link-objects", link_objects); key!(post_link_objects = "post-link-objects", link_objects); @@ -50,7 +50,7 @@ index 9cdc0801b1f0..70fe8396b353 100644 key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects); key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects); // Deserializes the backwards-compatible variants of `-Clink-self-contained` -@@ -708,6 +709,7 @@ macro_rules! target_option_val { +@@ -723,6 +724,7 @@ macro_rules! target_option_val { target_option_val!(linker_is_gnu_json, "linker-is-gnu"); target_option_val!(pre_link_objects); target_option_val!(post_link_objects); @@ -59,10 +59,10 @@ index 9cdc0801b1f0..70fe8396b353 100644 target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback"); target_option_val!(link_args - pre_link_args_json, "pre-link-args"); diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index 02962d55a60e..169f5a74bbfd 100644 +index 794d6457cb78..b2d88a14bb57 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -2197,6 +2197,7 @@ pub struct TargetOptions { +@@ -2237,6 +2237,7 @@ pub struct TargetOptions { /// Objects to link before and after all other object code. pub pre_link_objects: CrtObjects, pub post_link_objects: CrtObjects, @@ -70,7 +70,7 @@ index 02962d55a60e..169f5a74bbfd 100644 /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled. pub pre_link_objects_self_contained: CrtObjects, pub post_link_objects_self_contained: CrtObjects, -@@ -2712,6 +2713,7 @@ fn default() -> TargetOptions { +@@ -2754,6 +2755,7 @@ fn default() -> TargetOptions { relro_level: RelroLevel::None, pre_link_objects: Default::default(), post_link_objects: Default::default(), @@ -99,5 +99,5 @@ index 0862958d05da..b1e736d68627 100644 // Right now this is a bit of a workaround but we're currently saying that // the target by default has a static crt which we're taking as a signal -- -2.47.1 +2.48.1 diff --git a/rust.spec b/rust.spec index ebf3d6f..a0a2786 100644 --- a/rust.spec +++ b/rust.spec @@ -1,5 +1,5 @@ Name: rust -Version: 1.85.0 +Version: 1.86.0 Release: 1%{?dist} Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0) @@ -14,9 +14,9 @@ ExclusiveArch: %{rust_arches} # To bootstrap from scratch, set the channel and date from src/stage0.json # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13 # or nightly wants some beta-YYYY-MM-DD -%global bootstrap_version 1.84.0 -%global bootstrap_channel 1.84.0 -%global bootstrap_date 2025-01-09 +%global bootstrap_version 1.85.0 +%global bootstrap_channel 1.85.0 +%global bootstrap_date 2025-02-20 # Only the specified arches will use bootstrap binaries. # NOTE: Those binaries used to be uploaded with every new release, but that was @@ -28,7 +28,8 @@ ExclusiveArch: %{rust_arches} # We need CRT files for *-wasi targets, at least as new as the commit in # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh %global wasi_libc_url https://github.com/WebAssembly/wasi-libc -%global wasi_libc_ref wasi-sdk-25 +#global wasi_libc_ref wasi-sdk-25 +%global wasi_libc_ref 640c0cfc19a96b099e0791824be5ef0105ce2084 %global wasi_libc_name wasi-libc-%{wasi_libc_ref} %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz %global wasi_libc_dir %{_builddir}/%{wasi_libc_name} @@ -45,15 +46,15 @@ ExclusiveArch: %{rust_arches} # is insufficient. Rust currently requires LLVM 18.0+. %global min_llvm_version 18.0.0 %global bundled_llvm_version 19.1.7 -#global llvm_compat_version 18 +#global llvm_compat_version 19 %global llvm llvm%{?llvm_compat_version} %bcond_with bundled_llvm -# Requires stable libgit2 1.8, and not the next minor soname change. +# Requires stable libgit2 1.9, and not the next minor soname change. # This needs to be consistent with the bindings in vendor/libgit2-sys. -%global min_libgit2_version 1.8.1 -%global next_libgit2_version 1.9.0~ -%global bundled_libgit2_version 1.8.1 +%global min_libgit2_version 1.9.0 +%global next_libgit2_version 1.10.0~ +%global bundled_libgit2_version 1.9.0 %if 0%{?fedora} >= 41 %bcond_with bundled_libgit2 %else @@ -71,7 +72,7 @@ ExclusiveArch: %{rust_arches} # Cargo uses UPSERTs with omitted conflict targets %global min_sqlite3_version 3.35 -%global bundled_sqlite3_version 3.46.0 +%global bundled_sqlite3_version 3.48.0 %if 0%{?rhel} && 0%{?rhel} < 10 %bcond_without bundled_sqlite3 %else @@ -137,10 +138,7 @@ Patch4: 0001-bootstrap-allow-disabling-target-self-contained.patch Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch # We don't want to use the bundled library in libsqlite3-sys -Patch6: rustc-1.85.0-unbundle-sqlite.patch - -# https://github.com/rust-lang/cc-rs/issues/1354 -Patch7: 0001-Only-translate-profile-flags-for-Clang.patch +Patch6: rustc-1.86.0-unbundle-sqlite.patch ### RHEL-specific patches below ### @@ -150,7 +148,7 @@ Source101: cargo_vendor.attr Source102: cargo_vendor.prov # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949) -Patch100: rustc-1.85.0-disable-libssh2.patch +Patch100: rustc-1.86.0-disable-libssh2.patch # Get the Rust triple for any architecture and ABI. %{lua: function rust_triple(arch, abi) @@ -284,6 +282,7 @@ Provides: bundled(llvm) = %{bundled_llvm_version} BuildRequires: cmake >= 3.5.1 %if %defined llvm_compat_version %global llvm_root %{_libdir}/%{llvm} +%global llvm_path %{llvm_root}/bin %else %global llvm_root %{_prefix} %endif @@ -337,12 +336,6 @@ Requires: /usr/bin/cc %global __brp_strip_static_archive %{nil} %global __brp_strip_lto %{nil} -%if %{without bundled_llvm} -%if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1} -%global llvm_has_filecheck 1 -%endif -%endif - # We're going to override --libdir when configuring to get rustlib into a # common path, but we'll fix the shared libraries during install. %global common_libdir %{_prefix}/lib @@ -361,11 +354,11 @@ BuildRequires: mingw64-winpthreads-static %if %defined wasm_targets %if %with bundled_wasi_libc -BuildRequires: clang +BuildRequires: clang%{?llvm_compat_version} %else BuildRequires: wasi-libc-static %endif -BuildRequires: lld +BuildRequires: lld%{?llvm_compat_version} %endif # For profiler_builtins @@ -375,6 +368,29 @@ BuildRequires: compiler-rt%{?llvm_compat_version} # https://github.com/rust-lang/rust/pull/101841 Obsoletes: %{name}-analysis < 1.69.0~ +# Experimenting with a fine-grained version of %%cargo_vendor_manifest, +# so we can have different bundled provides for each tool subpackage. +%define cargo_tree_manifest(n:m:f:t:) ( \ + %{!-n:%{error:must specify a tool name}} \ + set -euo pipefail \ + mkdir -p build/manifests/%{-n*} \ + %{shrink: \ + env RUSTC_BOOTSTRAP=1 \ + %{local_rust_root}/bin/cargo tree \ + --offline --edges normal,build \ + --prefix none --format "{p}" \ + %{-m:--manifest-path %{-m*}/Cargo.toml} \ + %{-f:--features %{-f*}} \ + %{-t:--target %{-t*}} \ + %* \ + | sed '/([*/]/d; s/ (proc-macro)$//' \ + | sort -u \ + >build/manifests/%{-n*}/cargo-vendor.txt \ + } \ +) +%{?fedora:BuildRequires: cargo-rpm-macros} +%{?rhel:BuildRequires: rust-toolset} + %description Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety. @@ -529,8 +545,9 @@ Provides: bundled(sqlite) = %{bundled_sqlite3_version} %endif # For tests: BuildRequires: git-core -# Cargo is not much use without Rust -Requires: %{name} +# Cargo is not much use without Rust, and it's worth keeping the versions +# in sync since some feature development depends on them together. +Requires: %{name} = %{version}-%{release} # "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and # Provides are mostly relevant to RHEL, but harmless to have on Fedora/etc. too @@ -648,7 +665,6 @@ rm -rf %{wasi_libc_dir}/dlmalloc/ %if %without bundled_sqlite3 %patch -P6 -p1 %endif -%patch -P7 -p1 -d vendor/cc-1.2.6 %if %with disabled_libssh2 %patch -P100 -p1 @@ -668,7 +684,7 @@ mkdir -p src/llvm-project/libunwind/ # Remove submodules we don't need. rm -rf src/gcc rm -rf src/tools/enzyme -rm -rf src/tools/rustc-perf +rm -rf src/tools/rustc-perf/collector/*-benchmarks/ # Remove other unused vendored libraries. This leaves the directory in place, # because some build scripts watch them, e.g. "cargo:rerun-if-changed=curl". @@ -746,6 +762,7 @@ end} %{!?with_bundled_oniguruma:RUSTONIG_SYSTEM_LIBONIG=1} %{!?with_bundled_sqlite3:LIBSQLITE3_SYS_USE_PKG_CONFIG=1} %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1} + %{?llvm_path:PATH="%{llvm_path}:$PATH"} } %global export_rust_env export %{rust_env} ; source /opt/rh/gcc-toolset-14/enable @@ -802,12 +819,8 @@ end} %endif # Find the compiler-rt library for the Rust profiler_builtins crate. -%if %defined llvm_compat_version -# clang_resource_dir is not defined for compat builds. -%define profiler /usr/lib/clang/%{llvm_compat_version}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a -%else -%define profiler %{clang_resource_dir}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a -%endif +%define clang_lib %{expand:%%clang%{?llvm_compat_version}_resource_dir}/lib +%define profiler %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a test -r "%{profiler}" %configure --disable-option-checking \ @@ -826,7 +839,6 @@ test -r "%{profiler}" --local-rust-root=%{local_rust_root} \ --set build.rustfmt=/bin/true \ %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \ - %{!?llvm_has_filecheck: --disable-codegen-tests} \ %{!?with_llvm_static: --enable-llvm-link-shared } } \ --disable-llvm-static-stdcpp \ --disable-llvm-bitcode-linker \ @@ -853,6 +865,9 @@ test -r "%{profiler}" # Skipping PGO on s390x until we get LLVM 20, due to # https://github.com/llvm/llvm-project/issues/124001 %ifnarch s390x +# rustc is exibiting signs of miscompilation on pwr9+pgo (root cause TBD), +# so we're skipping pgo on rhel ppc64le for now. +%if !( 0%{?rhel} && "%{_target_cpu}" == "ppc64le" ) %if %with rustc_pgo # Build the compiler with profile instrumentation %define profraw $PWD/build/profiles @@ -863,12 +878,13 @@ mkdir -p "%{profraw}" env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \ %{__x} --keep-stage=0 --keep-stage=1 build cargo # Finalize the profile data and clean up the raw files -%{llvm_root}/bin/llvm-profdata merge -o "%{profdata}" "%{profraw}" +llvm-profdata merge -o "%{profdata}" "%{profraw}" rm -r "%{profraw}" build/%{rust_triple}/stage2*/ # Redefine the macro to use that profile data from now on %global __x %{__x} --rust-profile-use="%{profdata}" %endif %endif +%endif # Build the compiler normally (with or without PGO) %{__x} build sysroot @@ -881,6 +897,21 @@ for triple in %{?all_targets} ; do %{__x} build --target=$triple std done +# Collect cargo-vendor.txt for each tool and std +%{cargo_tree_manifest -n rustc -- -p rustc-main -p rustdoc} +%{cargo_tree_manifest -n cargo -m src/tools/cargo} +%{cargo_tree_manifest -n clippy -m src/tools/clippy} +%{cargo_tree_manifest -n rust-analyzer -m src/tools/rust-analyzer} +%{cargo_tree_manifest -n rustfmt -m src/tools/rustfmt} + +%{cargo_tree_manifest -n std -m library -f backtrace} +for triple in %{?all_targets} ; do + case $triple in + *-none*) %{cargo_tree_manifest -n std-$triple -m library/alloc -t $triple} ;; + *) %{cargo_tree_manifest -n std-$triple -m library -f backtrace -t $triple} ;; + esac +done + %install %if 0%{?rhel} && 0%{?rhel} <= 9 %{?set_build_flags} @@ -1025,6 +1056,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_libexecdir}/rust-analyzer-proc-macro-srv %{_mandir}/man1/rustc.1* %{_mandir}/man1/rustdoc.1* +%license build/manifests/rustc/cargo-vendor.txt +%license %{_pkgdocdir}/COPYRIGHT.html +%license %{_pkgdocdir}/licenses/ %files std-static @@ -1033,13 +1067,16 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.rlib %{rustlibdir}/%{rust_triple}/lib/*.so +%license build/manifests/std/cargo-vendor.txt +%license %{_pkgdocdir}/COPYRIGHT-library.html %global target_files() \ %files std-static-%1 \ %dir %{rustlibdir} \ %dir %{rustlibdir}/%1 \ %dir %{rustlibdir}/%1/lib \ -%{rustlibdir}/%1/lib/*.rlib +%{rustlibdir}/%1/lib/*.rlib \ +%license build/manifests/std-%1/cargo-vendor.txt %if %target_enabled i686-pc-windows-gnu %target_files i686-pc-windows-gnu @@ -1121,6 +1158,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_datadir}/zsh/site-functions/_cargo %dir %{_datadir}/cargo %dir %{_datadir}/cargo/registry +%license build/manifests/cargo/cargo-vendor.txt %files -n rustfmt @@ -1128,6 +1166,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_bindir}/cargo-fmt %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md %license src/tools/rustfmt/LICENSE-{APACHE,MIT} +%license build/manifests/rustfmt/cargo-vendor.txt %files analyzer @@ -1135,6 +1174,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_bindir}/rust-analyzer %doc src/tools/rust-analyzer/README.md %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT} +%license build/manifests/rust-analyzer/cargo-vendor.txt %files -n clippy @@ -1142,6 +1182,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_bindir}/clippy-driver %doc src/tools/clippy/{README.md,CHANGELOG.md} %license src/tools/clippy/LICENSE-{APACHE,MIT} +%license build/manifests/clippy/cargo-vendor.txt %files src @@ -1158,6 +1199,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %changelog +* Wed Apr 30 2025 Josh Stone - 1.86.0-1 +- Update to 1.86.0 + * Tue Apr 29 2025 Josh Stone - 1.85.0-1 - Update to 1.85.0 diff --git a/rustc-1.85.0-disable-libssh2.patch b/rustc-1.85.0-disable-libssh2.patch deleted file mode 100644 index 09be945..0000000 --- a/rustc-1.85.0-disable-libssh2.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 2025-01-17 14:26:49.845587361 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-01-17 14:26:49.848587324 -0800 -@@ -2296,7 +2296,6 @@ checksum = "10472326a8a6477c3c20a64547b0 - dependencies = [ - "cc", - "libc", -- "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -@@ -2337,20 +2336,6 @@ dependencies = [ - "pkg-config", - "vcpkg", - ] -- --[[package]] --name = "libssh2-sys" --version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" --dependencies = [ -- "cc", -- "libc", -- "libz-sys", -- "openssl-sys", -- "pkg-config", -- "vcpkg", --] - - [[package]] - name = "libz-sys" -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 2025-01-17 14:26:49.848587324 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-01-17 14:27:49.035844397 -0800 -@@ -47,7 +47,7 @@ curl = "0.4.46" - curl-sys = "0.4.73" - filetime = "0.2.23" - flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] } --git2 = "0.19.0" -+git2 = { version = "0.19.0", default-features = false, features = ["https"] } - git2-curl = "0.20.0" - gix = { version = "0.69.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } - glob = "0.3.1" diff --git a/rustc-1.85.0-unbundle-sqlite.patch b/rustc-1.85.0-unbundle-sqlite.patch deleted file mode 100644 index 08c395f..0000000 --- a/rustc-1.85.0-unbundle-sqlite.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 2025-01-11 07:18:58.000000000 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-01-17 14:14:33.072839703 -0800 -@@ -2334,7 +2334,6 @@ version = "0.30.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" - dependencies = [ -- "cc", - "pkg-config", - "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 2025-01-17 14:14:33.072839703 -0800 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-01-17 14:15:48.497891366 -0800 -@@ -80,7 +80,7 @@ proptest = "1.5.0" - pulldown-cmark = { version = "0.12.0", default-features = false, features = ["html"] } - rand = "0.8.5" - regex = "1.10.5" --rusqlite = { version = "0.32.0", features = ["bundled"] } -+rusqlite = { version = "0.32.0", features = [] } - rustc-hash = "2.0.0" - rustc-stable-hash = "0.1.1" - rustfix = { version = "0.9.0", path = "crates/rustfix" } diff --git a/rustc-1.86.0-disable-libssh2.patch b/rustc-1.86.0-disable-libssh2.patch new file mode 100644 index 0000000..8b07bde --- /dev/null +++ b/rustc-1.86.0-disable-libssh2.patch @@ -0,0 +1,44 @@ +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 2025-03-11 15:36:38.387335541 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-03-11 15:39:27.491711044 -0700 +@@ -2528,7 +2528,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c + dependencies = [ + "cc", + "libc", +- "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +@@ -2574,20 +2573,6 @@ dependencies = [ + "pkg-config", + "vcpkg", + ] +- +-[[package]] +-name = "libssh2-sys" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9" +-dependencies = [ +- "cc", +- "libc", +- "libz-sys", +- "openssl-sys", +- "pkg-config", +- "vcpkg", +-] + + [[package]] + name = "libz-sys" +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 2025-03-11 15:36:38.389045348 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-03-11 15:38:36.948228456 -0700 +@@ -47,7 +47,7 @@ curl = "0.4.47" + curl-sys = "0.4.79" + filetime = "0.2.25" + flate2 = { version = "1.0.35", default-features = false, features = ["zlib"] } +-git2 = "0.20.0" ++git2 = { version = "0.20.0", default-features = false, features = ["https"] } + git2-curl = "0.21.0" + gix = { version = "0.70.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } + glob = "0.3.2" diff --git a/rustc-1.86.0-unbundle-sqlite.patch b/rustc-1.86.0-unbundle-sqlite.patch new file mode 100644 index 0000000..19f5fce --- /dev/null +++ b/rustc-1.86.0-unbundle-sqlite.patch @@ -0,0 +1,23 @@ +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 2025-03-11 15:30:39.383119717 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-03-11 15:32:12.486164705 -0700 +@@ -2571,7 +2571,6 @@ version = "0.31.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ad8935b44e7c13394a179a438e0cebba0fe08fe01b54f152e29a93b5cf993fd4" + dependencies = [ +- "cc", + "pkg-config", + "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 2025-03-11 15:30:39.384466481 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-03-11 15:32:05.989298381 -0700 +@@ -80,7 +80,7 @@ proptest = "1.6.0" + pulldown-cmark = { version = "0.12.2", default-features = false, features = ["html"] } + rand = "0.9.0" + regex = "1.11.1" +-rusqlite = { version = "0.33.0", features = ["bundled"] } ++rusqlite = { version = "0.33.0", features = [] } + rustc-hash = "2.1.1" + rustc-stable-hash = "0.1.1" + rustfix = { version = "0.9.0", path = "crates/rustfix" } diff --git a/sources b/sources index b0e42b4..583e27d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rustc-1.85.0-src.tar.xz) = 3e9c933d1d9b6e5fb081837cf07eb1638b1a6b4fd1cb607dd860c5021ba7b521edbaf8ba0fa8f182f62178b72a3e1a3e6b26675e8fb6530871137852a074443c -SHA512 (wasi-libc-wasi-sdk-25.tar.gz) = 580716fbc152be19e2e9724f3483a0a580a168be0cd6d105d37b0ebd0d11bd36d7d9db63984eb2cc7b3aaff2fc9446d9558d1469b538a79b7de465a1113560ea +SHA512 (rustc-1.86.0-src.tar.xz) = 9ce195e24a03765f7163de16271e3d19d731d4b80fcc2bfd919106c9d42543eade018f712f6947ea3c6e57c6cb2e6841596aa668d608b8da15101a7da14f3097 +SHA512 (wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz) = 7626200112b6e55567855b950baf7c9eeaf47e7de34a30eb9e8b785e0e03063197102d2f39d0846055d6aab7c06232f947a6b8af3dda62c8f02ea39d8f765a5e From f9b3cd5b72ac1466e9e42a95ec6fa9e59f5104e1 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 29 May 2025 17:54:57 -0700 Subject: [PATCH 3/6] Update to Rust 1.87.0 Resolves: RHEL-81602 Resolves: RHEL-81627 Resolves: RHEL-92432 --- .gitignore | 1 + ...ltins-build-script-to-handle-full-pa.patch | 42 +++++++++++++++ ...llow-disabling-target-self-contained.patch | 44 ++++++++-------- ...xternal-library-path-for-wasm32-wasi.patch | 34 ++++++------- rust.spec | 51 ++++++++++--------- ...atch => rustc-1.87.0-unbundle-sqlite.patch | 10 ++-- sources | 2 +- 7 files changed, 116 insertions(+), 68 deletions(-) create mode 100644 0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch rename rustc-1.86.0-unbundle-sqlite.patch => rustc-1.87.0-unbundle-sqlite.patch (74%) diff --git a/.gitignore b/.gitignore index e23dd23..61b26cb 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ SOURCES/wasi-libc-wasi-sdk-17.tar.gz /rustc-1.85.1-src.tar.xz /rustc-1.86.0-src.tar.xz /wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz +/rustc-1.87.0-src.tar.xz diff --git a/0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch b/0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch new file mode 100644 index 0000000..2746541 --- /dev/null +++ b/0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch @@ -0,0 +1,42 @@ +From dc0fbcab7e0673afe62b3e8e74905d9e5f5b74a4 Mon Sep 17 00:00:00 2001 +From: Jesus Checa Hidalgo +Date: Fri, 11 Apr 2025 16:57:38 +0200 +Subject: [PATCH] Fix profiler_builtins build script to handle full path to + profiler lib + +LLVM_PROFILER_RT_LIB may be set to an absolute path (e.g., in Fedora builds), +but `-l` expects a library name, not a path. After #138273, this caused builds +to fail with a "could not find native static library" error. + +This patch updates the build script to split the path into directory and +filename, using `cargo::rustc-link-search` for the directory and +`cargo::rustc-link-lib=+verbatim` for the file. This allows profiler_builtins to +correctly link the static library even when an absolute path is provided. +--- + library/profiler_builtins/build.rs | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/library/profiler_builtins/build.rs b/library/profiler_builtins/build.rs +index dd85239fa8c..fc1a9ecc1ec 100644 +--- a/library/profiler_builtins/build.rs ++++ b/library/profiler_builtins/build.rs +@@ -9,8 +9,14 @@ + + fn main() { + if let Ok(rt) = tracked_env_var("LLVM_PROFILER_RT_LIB") { +- println!("cargo::rustc-link-lib=static:+verbatim={rt}"); +- return; ++ let rt = PathBuf::from(rt); ++ if let Some(lib) = rt.file_name() { ++ if let Some(dir) = rt.parent() { ++ println!("cargo::rustc-link-search=native={}", dir.display()); ++ } ++ println!("cargo::rustc-link-lib=static:+verbatim={}", lib.to_str().unwrap()); ++ return; ++ } + } + + let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS was not set"); +-- +2.49.0 + diff --git a/0001-bootstrap-allow-disabling-target-self-contained.patch b/0001-bootstrap-allow-disabling-target-self-contained.patch index 9ee7b78..655496c 100644 --- a/0001-bootstrap-allow-disabling-target-self-contained.patch +++ b/0001-bootstrap-allow-disabling-target-self-contained.patch @@ -1,22 +1,22 @@ -From c3307f4e1826cabd8e7e4a54636b0e79afb97835 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Thu, 28 Sep 2023 18:14:28 -0700 +From e8833a9032b9f5773ef891b3f12b93322d6b4950 Mon Sep 17 00:00:00 2001 +From: Jesus Checa Hidalgo +Date: Mon, 7 Apr 2025 16:59:10 +0200 Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained --- - config.example.toml | 5 +++++ + bootstrap.example.toml | 5 +++++ src/bootstrap/src/core/build_steps/compile.rs | 4 ++++ src/bootstrap/src/core/config/config.rs | 8 ++++++++ src/bootstrap/src/lib.rs | 5 +++++ 4 files changed, 22 insertions(+) -diff --git a/config.example.toml b/config.example.toml -index f5395375afe4..a96368ae4ef2 100644 ---- a/config.example.toml -+++ b/config.example.toml -@@ -927,6 +927,11 @@ - # order to run `x check`. - #optimized-compiler-builtins = build.optimized-compiler-builtins (bool) +diff --git a/bootstrap.example.toml b/bootstrap.example.toml +index 2a98821f225..580d6b2a8a2 100644 +--- a/bootstrap.example.toml ++++ b/bootstrap.example.toml +@@ -948,6 +948,11 @@ + # This overrides the global `rust.jemalloc` option. See that option for more info. + #jemalloc = rust.jemalloc (bool) +# Copy libc and CRT objects into the target lib/self-contained/ directory. +# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other @@ -27,10 +27,10 @@ index f5395375afe4..a96368ae4ef2 100644 # Distribution options # diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs -index 479327d63695..97d2bf2df8bb 100644 +index 18b5d4426b1..3de9667123b 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs -@@ -327,6 +327,10 @@ fn copy_self_contained_objects( +@@ -370,6 +370,10 @@ fn copy_self_contained_objects( compiler: &Compiler, target: TargetSelection, ) -> Vec<(PathBuf, DependencyType)> { @@ -42,18 +42,18 @@ index 479327d63695..97d2bf2df8bb 100644 builder.sysroot_target_libdir(*compiler, target).join("self-contained"); t!(fs::create_dir_all(&libdir_self_contained)); diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs -index 65f286a05bd5..dc4d6f741bcf 100644 +index bbb0fbfbb93..8642a86cbf8 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs -@@ -643,6 +643,7 @@ pub struct Target { - pub no_std: bool, +@@ -666,6 +666,7 @@ pub struct Target { pub codegen_backends: Option>, pub optimized_compiler_builtins: Option, + pub jemalloc: Option, + pub self_contained: bool, } impl Target { -@@ -654,6 +655,9 @@ pub fn from_triple(triple: &str) -> Self { +@@ -677,6 +678,9 @@ pub fn from_triple(triple: &str) -> Self { if triple.contains("emscripten") { target.runner = Some("node".into()); } @@ -63,15 +63,15 @@ index 65f286a05bd5..dc4d6f741bcf 100644 target } } -@@ -1234,6 +1238,7 @@ struct TomlTarget { - codegen_backends: Option> = "codegen-backends", +@@ -1292,6 +1296,7 @@ struct TomlTarget { runner: Option = "runner", optimized_compiler_builtins: Option = "optimized-compiler-builtins", + jemalloc: Option = "jemalloc", + self_contained: Option = "self-contained", } } -@@ -2146,6 +2151,9 @@ fn get_table(option: &str) -> Result { +@@ -2245,6 +2250,9 @@ fn get_table(option: &str) -> Result { if let Some(s) = cfg.no_std { target.no_std = s; } @@ -82,10 +82,10 @@ index 65f286a05bd5..dc4d6f741bcf 100644 target.cxx = cfg.cxx.map(PathBuf::from); target.ar = cfg.ar.map(PathBuf::from); diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs -index 21b02a3b541a..6b98c67457e8 100644 +index 843d474f92d..3a4398ee1f8 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs -@@ -1366,6 +1366,11 @@ fn no_std(&self, target: TargetSelection) -> Option { +@@ -1434,6 +1434,11 @@ fn no_std(&self, target: TargetSelection) -> Option { self.config.target_config.get(&target).map(|t| t.no_std) } diff --git a/0002-set-an-external-library-path-for-wasm32-wasi.patch b/0002-set-an-external-library-path-for-wasm32-wasi.patch index 2441d07..b1f2476 100644 --- a/0002-set-an-external-library-path-for-wasm32-wasi.patch +++ b/0002-set-an-external-library-path-for-wasm32-wasi.patch @@ -1,6 +1,6 @@ -From 9551ffded09131ac225261ab55a7b3c9d09ad3bb Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Thu, 28 Sep 2023 18:18:16 -0700 +From 35a37bd892939b8a1cd194632de3b9dd3a3d479b Mon Sep 17 00:00:00 2001 +From: Jesus Checa Hidalgo +Date: Mon, 7 Apr 2025 17:22:56 +0200 Subject: [PATCH 2/2] set an external library path for wasm32-wasi --- @@ -11,10 +11,10 @@ Subject: [PATCH 2/2] set an external library path for wasm32-wasi 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index 105a4cb81f0d..21bd626842c7 100644 +index b59d73a9aae..2369d73b4e3 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -1686,6 +1686,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat +@@ -1583,6 +1583,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat return file_path; } } @@ -27,10 +27,10 @@ index 105a4cb81f0d..21bd626842c7 100644 for search_path in sess.target_filesearch().search_paths(PathKind::Native) { let file_path = search_path.dir.join(name); if file_path.exists() { -@@ -2186,6 +2192,10 @@ fn add_library_search_dirs( - ControlFlow::<()>::Continue(()) - }, - ); +@@ -2140,6 +2146,10 @@ fn add_library_search_dirs( + } + ControlFlow::<()>::Continue(()) + }); + + if let Some(lib_path) = &sess.target.options.external_lib_path { + cmd.include_path(Path::new(lib_path.as_ref())); @@ -39,10 +39,10 @@ index 105a4cb81f0d..21bd626842c7 100644 /// Add options making relocation sections in the produced ELF files read-only diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs -index f703132e51f0..c4821be7d12e 100644 +index 4b6de5e18f5..373301d85ab 100644 --- a/compiler/rustc_target/src/spec/json.rs +++ b/compiler/rustc_target/src/spec/json.rs -@@ -540,6 +540,7 @@ macro_rules! key { +@@ -559,6 +559,7 @@ macro_rules! key { key!(linker_is_gnu_json = "linker-is-gnu", bool); key!(pre_link_objects = "pre-link-objects", link_objects); key!(post_link_objects = "post-link-objects", link_objects); @@ -50,7 +50,7 @@ index f703132e51f0..c4821be7d12e 100644 key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects); key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects); // Deserializes the backwards-compatible variants of `-Clink-self-contained` -@@ -723,6 +724,7 @@ macro_rules! target_option_val { +@@ -744,6 +745,7 @@ macro_rules! target_option_val { target_option_val!(linker_is_gnu_json, "linker-is-gnu"); target_option_val!(pre_link_objects); target_option_val!(post_link_objects); @@ -59,10 +59,10 @@ index f703132e51f0..c4821be7d12e 100644 target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback"); target_option_val!(link_args - pre_link_args_json, "pre-link-args"); diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index 794d6457cb78..b2d88a14bb57 100644 +index 7234d1dc63e..3ec85bbf279 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -2237,6 +2237,7 @@ pub struct TargetOptions { +@@ -2301,6 +2301,7 @@ pub struct TargetOptions { /// Objects to link before and after all other object code. pub pre_link_objects: CrtObjects, pub post_link_objects: CrtObjects, @@ -70,7 +70,7 @@ index 794d6457cb78..b2d88a14bb57 100644 /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled. pub pre_link_objects_self_contained: CrtObjects, pub post_link_objects_self_contained: CrtObjects, -@@ -2754,6 +2755,7 @@ fn default() -> TargetOptions { +@@ -2821,6 +2822,7 @@ fn default() -> TargetOptions { relro_level: RelroLevel::None, pre_link_objects: Default::default(), post_link_objects: Default::default(), @@ -79,10 +79,10 @@ index 794d6457cb78..b2d88a14bb57 100644 post_link_objects_self_contained: Default::default(), link_self_contained: LinkSelfContainedDefault::False, diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs -index 0862958d05da..b1e736d68627 100644 +index 26add451ed2..3eaf050e682 100644 --- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs +++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs -@@ -19,11 +19,12 @@ pub(crate) fn target() -> Target { +@@ -21,11 +21,12 @@ pub(crate) fn target() -> Target { options.env = "p1".into(); options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]); diff --git a/rust.spec b/rust.spec index a0a2786..a4cba40 100644 --- a/rust.spec +++ b/rust.spec @@ -1,5 +1,5 @@ Name: rust -Version: 1.86.0 +Version: 1.87.0 Release: 1%{?dist} Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0) @@ -14,9 +14,9 @@ ExclusiveArch: %{rust_arches} # To bootstrap from scratch, set the channel and date from src/stage0.json # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13 # or nightly wants some beta-YYYY-MM-DD -%global bootstrap_version 1.85.0 -%global bootstrap_channel 1.85.0 -%global bootstrap_date 2025-02-20 +%global bootstrap_version 1.86.0 +%global bootstrap_channel 1.86.0 +%global bootstrap_date 2025-04-03 # Only the specified arches will use bootstrap binaries. # NOTE: Those binaries used to be uploaded with every new release, but that was @@ -45,7 +45,7 @@ ExclusiveArch: %{rust_arches} # We can also choose to just use Rust's bundled LLVM, in case the system LLVM # is insufficient. Rust currently requires LLVM 18.0+. %global min_llvm_version 18.0.0 -%global bundled_llvm_version 19.1.7 +%global bundled_llvm_version 20.1.1 #global llvm_compat_version 19 %global llvm llvm%{?llvm_compat_version} %bcond_with bundled_llvm @@ -138,7 +138,11 @@ Patch4: 0001-bootstrap-allow-disabling-target-self-contained.patch Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch # We don't want to use the bundled library in libsqlite3-sys -Patch6: rustc-1.86.0-unbundle-sqlite.patch +Patch6: rustc-1.87.0-unbundle-sqlite.patch + +# Split the absolute path of libclang_rt.profile.a when passed to profiler_builtns +# Upstream PR: https://github.com/rust-lang/rust/pull/139677 +Patch7: 0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch ### RHEL-specific patches below ### @@ -240,6 +244,7 @@ BuildRequires: (%{name} >= %{bootstrap_version} with %{name} <= %{version}) BuildRequires: make BuildRequires: gcc-toolset-14-annobin-plugin-gcc +BuildRequires: gcc-toolset-14-gcc-plugin-annobin BuildRequires: gcc-toolset-14-binutils BuildRequires: gcc-toolset-14-gcc BuildRequires: gcc-toolset-14-gcc-c++ @@ -509,7 +514,7 @@ programs. Summary: LLDB pretty printers for Rust BuildArch: noarch Requires: lldb -Requires: python3-lldb +Requires: python3.12-lldb Requires: %{name}-debugger-common = %{version}-%{release} %description lldb @@ -666,6 +671,8 @@ rm -rf %{wasi_libc_dir}/dlmalloc/ %patch -P6 -p1 %endif +%patch -P7 -p1 + %if %with disabled_libssh2 %patch -P100 -p1 %endif @@ -854,7 +861,7 @@ test -r "%{profiler}" --set build.optimized-compiler-builtins=false \ --set rust.llvm-tools=false \ --enable-extended \ - --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \ + --tools=cargo,clippy,rust-analyzer,rustfmt,src \ --enable-vendor \ --enable-verbose-tests \ --release-channel=%{channel} \ @@ -862,29 +869,29 @@ test -r "%{profiler}" %global __x %{__python3} ./x.py -# Skipping PGO on s390x until we get LLVM 20, due to -# https://github.com/llvm/llvm-project/issues/124001 -%ifnarch s390x -# rustc is exibiting signs of miscompilation on pwr9+pgo (root cause TBD), -# so we're skipping pgo on rhel ppc64le for now. -%if !( 0%{?rhel} && "%{_target_cpu}" == "ppc64le" ) -%if %with rustc_pgo +# - rustc is exibiting signs of miscompilation on pwr9+pgo (root cause TBD), +# so we're skipping pgo on rhel ppc64le for now. See RHEL-88598 for more. +# - Since 1.87, Fedora started getting ppc64le segfaults, and this also seems +# to be avoidable by skipping pgo. See bz2367960 for examples of that. +%if %{with rustc_pgo} && !( "%{_target_cpu}" == "ppc64le" ) # Build the compiler with profile instrumentation %define profraw $PWD/build/profiles %define profdata $PWD/build/rustc.profdata mkdir -p "%{profraw}" %{__x} build sysroot --rust-profile-generate="%{profraw}" # Build cargo as a workload to generate compiler profiles +# We normally use `x.py`, but in this case we invoke the stage 2 compiler and libs +# directly to ensure we use the instrumented compiler. env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \ - %{__x} --keep-stage=0 --keep-stage=1 build cargo + LD_LIBRARY_PATH=$PWD/build/host/stage2/lib \ + RUSTC=$PWD/build/host/stage2/bin/rustc \ + cargo build --manifest-path=src/tools/cargo/Cargo.toml # Finalize the profile data and clean up the raw files llvm-profdata merge -o "%{profdata}" "%{profraw}" rm -r "%{profraw}" build/%{rust_triple}/stage2*/ # Redefine the macro to use that profile data from now on %global __x %{__x} --rust-profile-use="%{profdata}" %endif -%endif -%endif # Build the compiler normally (with or without PGO) %{__x} build sysroot @@ -924,9 +931,6 @@ for triple in %{?all_targets} ; do DESTDIR=%{buildroot} %{__x} install --target=$triple std done -# The rls stub doesn't have an install target, but we can just copy it. -%{__install} -t %{buildroot}%{_bindir} build/%{rust_triple}/stage2-tools-bin/rls - # These are transient files used by x.py dist and install rm -rf ./build/dist/ ./build/tmp/ @@ -1043,7 +1047,6 @@ timeout -v 30m %{__x} test --no-fail-fast rust-analyzer || : timeout -v 30m %{__x} test --no-fail-fast rustfmt || : - %ldconfig_scriptlets @@ -1170,7 +1173,6 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %files analyzer -%{_bindir}/rls %{_bindir}/rust-analyzer %doc src/tools/rust-analyzer/README.md %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT} @@ -1199,6 +1201,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %changelog +* Thu May 29 2025 Josh Stone - 1.87.0-1 +- Update to 1.87.0 + * Wed Apr 30 2025 Josh Stone - 1.86.0-1 - Update to 1.86.0 diff --git a/rustc-1.86.0-unbundle-sqlite.patch b/rustc-1.87.0-unbundle-sqlite.patch similarity index 74% rename from rustc-1.86.0-unbundle-sqlite.patch rename to rustc-1.87.0-unbundle-sqlite.patch index 19f5fce..da0fa26 100644 --- a/rustc-1.86.0-unbundle-sqlite.patch +++ b/rustc-1.87.0-unbundle-sqlite.patch @@ -10,14 +10,14 @@ 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 2025-03-11 15:30:39.384466481 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-03-11 15:32:05.989298381 -0700 -@@ -80,7 +80,7 @@ proptest = "1.6.0" - pulldown-cmark = { version = "0.12.2", default-features = false, features = ["html"] } +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-04-07 20:37:44.467359012 +0200 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-04-07 20:38:17.564060339 +0200 +@@ -79,7 +79,7 @@ proptest = "1.6.0" + pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } rand = "0.9.0" regex = "1.11.1" -rusqlite = { version = "0.33.0", features = ["bundled"] } +rusqlite = { version = "0.33.0", features = [] } rustc-hash = "2.1.1" - rustc-stable-hash = "0.1.1" + rustc-stable-hash = "0.1.2" rustfix = { version = "0.9.0", path = "crates/rustfix" } diff --git a/sources b/sources index 583e27d..a5e7cd0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rustc-1.86.0-src.tar.xz) = 9ce195e24a03765f7163de16271e3d19d731d4b80fcc2bfd919106c9d42543eade018f712f6947ea3c6e57c6cb2e6841596aa668d608b8da15101a7da14f3097 +SHA512 (rustc-1.87.0-src.tar.xz) = 2ef08c9be45434401f916d54b3739f52d255f8a3a4ce05a717499250c2333eeaf601f1d18085b878c027c609f44da74d0151f5bfc2c9ae1e01166919a91a1d2b SHA512 (wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz) = 7626200112b6e55567855b950baf7c9eeaf47e7de34a30eb9e8b785e0e03063197102d2f39d0846055d6aab7c06232f947a6b8af3dda62c8f02ea39d8f765a5e From 88c2b175533b12f2f271c7610be74714282afc9d Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 11 Jul 2025 12:14:16 -0700 Subject: [PATCH 4/6] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 315 +++++++++++++++++++++++++++++++++++++++++++++++++++++ rust.spec | 318 +----------------------------------------------------- 2 files changed, 317 insertions(+), 316 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..763960c --- /dev/null +++ b/changelog @@ -0,0 +1,315 @@ +* Thu May 29 2025 Josh Stone - 1.87.0-1 +- Update to 1.87.0 + +* Wed Apr 30 2025 Josh Stone - 1.86.0-1 +- Update to 1.86.0 + +* Tue Apr 29 2025 Josh Stone - 1.85.0-1 +- Update to 1.85.0 + +* Tue Feb 04 2025 Josh Stone - 1.84.1-1 +- Update to 1.84.1 + +* Wed Jan 15 2025 Josh Stone - 1.84.0-1 +- Update to 1.84.0 + +* Thu Dec 05 2024 Josh Stone - 1.83.0-1 +- Update to 1.83.0 +- Remove the subshell in the cargo_install macro + +* Tue Nov 05 2024 Josh Stone - 1.82.0-1 +- Update to 1.82.0 + +* Fri Oct 25 2024 Josh Stone - 1.81.0-1 +- Update to 1.81.0 + +* Tue Oct 22 2024 Josh Stone - 1.80.1-1 +- Update to 1.80.1 + +* Tue Aug 13 2024 Josh Stone - 1.79.0-2 +- Disable jump threading of float equality + +* Fri Jun 21 2024 Josh Stone - 1.79.0-1 +- Update to 1.79.0 + +* Fri Jun 21 2024 Josh Stone - 1.78.0-1 +- Update to 1.78.0 +- Make std-static-wasm* noarch again + +* Thu May 09 2024 Josh Stone - 1.77.2-1 +- Update to 1.77.2. + +* Wed Apr 17 2024 Josh Stone - 1.76.0-1 +- Update to 1.76.0. +- Sync rust-toolset macros to rust-packaging v25.2 + +* Fri Jan 05 2024 Josh Stone - 1.75.0-1 +- Update to 1.75.0. + +* Wed Jan 03 2024 Josh Stone - 1.74.1-1 +- Update to 1.74.1. + +* Tue Oct 17 2023 Josh Stone - 1.73.0-1 +- Update to 1.73.0. +- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc + +* Thu Oct 12 2023 Josh Stone - 1.72.1-1 +- Update to 1.72.1. +- Migrated to SPDX license + +* Tue Aug 08 2023 Josh Stone - 1.71.1-1 +- Update to 1.71.1. +- Security fix for CVE-2023-38497 + +* Wed Jul 26 2023 Josh Stone - 1.71.0-2 +- Relax the suspicious_double_ref_op lint (rhbz2225471) +- Enable the profiler runtime for native hosts (rhbz2213875) + +* Thu Jul 20 2023 Josh Stone - 1.71.0-1 +- Update to 1.71.0. + +* Tue Jul 18 2023 Josh Stone - 1.70.0-1 +- Update to 1.70.0. + +* Fri May 26 2023 Josh Stone - 1.69.0-1 +- Update to 1.69.0. +- Obsolete rust-analysis. + +* Fri May 19 2023 Josh Stone - 1.68.2-1 +- Update to 1.68.2. + +* Thu May 18 2023 Josh Stone - 1.67.1-1 +- Update to 1.67.1. + +* Wed Jan 11 2023 Josh Stone - 1.66.1-1 +- Update to 1.66.1. + +* Fri Jan 06 2023 Josh Stone - 1.65.0-1 +- Update to 1.65.0. +- rust-analyzer now obsoletes rls. + +* Thu Sep 22 2022 Josh Stone - 1.64.0-1 +- Update to 1.64.0. +- Add rust-analyzer. + +* Wed Sep 07 2022 Josh Stone - 1.63.0-1 +- Update to 1.63.0. + +* Tue Jul 19 2022 Josh Stone - 1.62.1-1 +- Update to 1.62.1. + +* Wed Jul 13 2022 Josh Stone - 1.62.0-2 +- Prevent unsound coercions from functions with opaque return types. + +* Thu Jun 30 2022 Josh Stone - 1.62.0-1 +- Update to 1.62.0. + +* Fri Jun 03 2022 Josh Stone - 1.61.0-1 +- Update to 1.61.0. +- Add rust-toolset as a subpackage. + +* Wed Apr 20 2022 Josh Stone - 1.60.0-1 +- Update to 1.60.0. + +* Tue Apr 19 2022 Josh Stone - 1.59.0-1 +- Update to 1.59.0. + +* Thu Jan 20 2022 Josh Stone - 1.58.1-1 +- Update to 1.58.1. + +* Thu Jan 13 2022 Josh Stone - 1.58.0-1 +- Update to 1.58.0. + +* Wed Dec 15 2021 Josh Stone - 1.57.0-1 +- Update to 1.57.0. + +* Thu Dec 02 2021 Josh Stone - 1.56.1-2 +- Add rust-std-static-wasm32-wasi + Resolves: rhbz#1980080 + +* Tue Nov 02 2021 Josh Stone - 1.56.0-1 +- Update to 1.56.1. + +* Fri Oct 29 2021 Josh Stone - 1.55.0-1 +- Update to 1.55.0. +- Backport support for LLVM 13. + +* Tue Aug 17 2021 Josh Stone - 1.54.0-2 +- Make std-static-wasm* arch-specific to avoid s390x. + +* Thu Jul 29 2021 Josh Stone - 1.54.0-1 +- Update to 1.54.0. + +* Tue Jul 20 2021 Josh Stone - 1.53.0-2 +- Use llvm-ranlib to fix wasm archives. + +* Mon Jun 21 2021 Josh Stone - 1.53.0-1 +- Update to 1.53.0. + +* Tue Jun 15 2021 Josh Stone - 1.52.1-2 +- Set rust.codegen-units-std=1 for all targets again. +- Add rust-std-static-wasm32-unknown-unknown. + +* Tue May 25 2021 Josh Stone - 1.52.1-1 +- Update to 1.52.1. Includes security fixes for CVE-2020-36323, + CVE-2021-28876, CVE-2021-28878, CVE-2021-28879, and CVE-2021-31162. + +* Mon May 24 2021 Josh Stone - 1.51.0-1 +- Update to 1.51.0. Update to 1.51.0. Includes security fixes for + CVE-2021-28875 and CVE-2021-28877. + +* Mon May 24 2021 Josh Stone - 1.50.0-1 +- Update to 1.50.0. + +* Wed Jan 13 2021 Josh Stone - 1.49.0-1 +- Update to 1.49.0. + +* Tue Jan 12 2021 Josh Stone - 1.48.0-1 +- Update to 1.48.0. + +* Thu Oct 22 2020 Josh Stone - 1.47.0-1 +- Update to 1.47.0. + +* Wed Oct 14 2020 Josh Stone - 1.46.0-1 +- Update to 1.46.0. + +* Tue Aug 04 2020 Josh Stone - 1.45.2-1 +- Update to 1.45.2. + +* Thu Jul 16 2020 Josh Stone - 1.45.0-1 +- Update to 1.45.0. + +* Tue Jul 14 2020 Josh Stone - 1.44.1-1 +- Update to 1.44.1. + +* Thu May 07 2020 Josh Stone - 1.43.1-1 +- Update to 1.43.1. + +* Thu Apr 23 2020 Josh Stone - 1.43.0-1 +- Update to 1.43.0. + +* Thu Mar 12 2020 Josh Stone - 1.42.0-1 +- Update to 1.42.0. + +* Thu Feb 27 2020 Josh Stone - 1.41.1-1 +- Update to 1.41.1. + +* Thu Jan 30 2020 Josh Stone - 1.41.0-1 +- Update to 1.41.0. + +* Thu Jan 16 2020 Josh Stone - 1.40.0-1 +- Update to 1.40.0. +- Fix compiletest with newer (local-rebuild) libtest +- Build compiletest with in-tree libtest +- Fix ARM EHABI unwinding + +* Tue Nov 12 2019 Josh Stone - 1.39.0-2 +- Fix a couple build and test issues with rustdoc. + +* Thu Nov 07 2019 Josh Stone - 1.39.0-1 +- Update to 1.39.0. + +* Thu Sep 26 2019 Josh Stone - 1.38.0-1 +- Update to 1.38.0. + +* Thu Aug 15 2019 Josh Stone - 1.37.0-1 +- Update to 1.37.0. +- Disable libssh2 (git+ssh support). + +* Thu Jul 04 2019 Josh Stone - 1.36.0-1 +- Update to 1.36.0. + +* Wed May 29 2019 Josh Stone - 1.35.0-2 +- Fix compiletest for rebuild testing. + +* Thu May 23 2019 Josh Stone - 1.35.0-1 +- Update to 1.35.0. + +* Tue May 14 2019 Josh Stone - 1.34.2-1 +- Update to 1.34.2 -- fixes CVE-2019-12083. + +* Thu May 09 2019 Josh Stone - 1.34.1-1 +- Update to 1.34.1. + +* Thu Apr 11 2019 Josh Stone - 1.34.0-1 +- Update to 1.34.0. + +* Wed Apr 10 2019 Josh Stone - 1.33.0-1 +- Update to 1.33.0. + +* Tue Apr 09 2019 Josh Stone - 1.32.0-1 +- Update to 1.32.0. + +* Fri Dec 14 2018 Josh Stone - 1.31.0-5 +- Restore rust-lldb. + +* Thu Dec 13 2018 Josh Stone - 1.31.0-4 +- Backport fixes for rls. + +* Thu Dec 13 2018 Josh Stone - 1.31.0-3 +- Update to 1.31.0 -- Rust 2018! +- clippy/rls/rustfmt are no longer -preview + +* Wed Dec 12 2018 Josh Stone - 1.30.1-2 +- Update to 1.30.1. + +* Tue Nov 06 2018 Josh Stone - 1.29.2-1 +- Update to 1.29.2. + +* Thu Nov 01 2018 Josh Stone - 1.28.0-1 +- Update to 1.28.0. + +* Thu Nov 01 2018 Josh Stone - 1.27.2-1 +- Update to 1.27.2. + +* Wed Oct 10 2018 Josh Stone - 1.26.2-12 +- Fix "fp" target feature for AArch64 (#1632880) + +* Mon Oct 08 2018 Josh Stone - 1.26.2-11 +- Security fix for str::repeat (pending CVE). + +* Fri Oct 05 2018 Josh Stone - 1.26.2-10 +- Rebuild without bootstrap binaries. + +* Thu Oct 04 2018 Josh Stone - 1.26.2-9 +- Bootstrap without SCL packaging. (rhbz1635067) + +* Tue Aug 28 2018 Tom Stellard - 1.26.2-8 +- Use python3 prefix for lldb Requires + +* Mon Aug 13 2018 Josh Stone - 1.26.2-7 +- Build with platform-python + +* Tue Aug 07 2018 Josh Stone - 1.26.2-6 +- Exclude rust-src from auto-requires + +* Thu Aug 02 2018 Josh Stone - 1.26.2-5 +- Rebuild without bootstrap binaries. + +* Tue Jul 31 2018 Josh Stone - 1.26.2-4 +- Bootstrap as a module. + +* Mon Jun 04 2018 Josh Stone - 1.26.2-3 +- Update to 1.26.2. + +* Wed May 30 2018 Josh Stone - 1.26.1-2 +- Update to 1.26.1. + +* Fri May 18 2018 Josh Stone - 1.26.0-1 +- Update to 1.26.0. + +* Tue Apr 10 2018 Josh Stone - 1.25.0-2 +- Filter codegen-backends from Provides too. + +* Tue Apr 03 2018 Josh Stone - 1.25.0-1 +- Update to 1.25.0. +- Add rustfmt-preview as a subpackage. + +* Thu Feb 22 2018 Josh Stone - 1.24.0-1 +- Update to 1.24.0. + +* Tue Jan 16 2018 Josh Stone - 1.23.0-2 +- Rebuild without bootstrap binaries. + +* Mon Jan 15 2018 Josh Stone - 1.23.0-1 +- Bootstrap 1.23 on el8. diff --git a/rust.spec b/rust.spec index a4cba40..7b2ef3e 100644 --- a/rust.spec +++ b/rust.spec @@ -1,6 +1,6 @@ Name: rust Version: 1.87.0 -Release: 1%{?dist} +Release: %autorelease Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0) # ^ written as: (rust itself) and (bundled libraries) @@ -1201,318 +1201,4 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %changelog -* Thu May 29 2025 Josh Stone - 1.87.0-1 -- Update to 1.87.0 - -* Wed Apr 30 2025 Josh Stone - 1.86.0-1 -- Update to 1.86.0 - -* Tue Apr 29 2025 Josh Stone - 1.85.0-1 -- Update to 1.85.0 - -* Tue Feb 04 2025 Josh Stone - 1.84.1-1 -- Update to 1.84.1 - -* Wed Jan 15 2025 Josh Stone - 1.84.0-1 -- Update to 1.84.0 - -* Thu Dec 05 2024 Josh Stone - 1.83.0-1 -- Update to 1.83.0 -- Remove the subshell in the cargo_install macro - -* Tue Nov 05 2024 Josh Stone - 1.82.0-1 -- Update to 1.82.0 - -* Fri Oct 25 2024 Josh Stone - 1.81.0-1 -- Update to 1.81.0 - -* Tue Oct 22 2024 Josh Stone - 1.80.1-1 -- Update to 1.80.1 - -* Tue Aug 13 2024 Josh Stone - 1.79.0-2 -- Disable jump threading of float equality - -* Fri Jun 21 2024 Josh Stone - 1.79.0-1 -- Update to 1.79.0 - -* Fri Jun 21 2024 Josh Stone - 1.78.0-1 -- Update to 1.78.0 -- Make std-static-wasm* noarch again - -* Thu May 09 2024 Josh Stone - 1.77.2-1 -- Update to 1.77.2. - -* Wed Apr 17 2024 Josh Stone - 1.76.0-1 -- Update to 1.76.0. -- Sync rust-toolset macros to rust-packaging v25.2 - -* Fri Jan 05 2024 Josh Stone - 1.75.0-1 -- Update to 1.75.0. - -* Wed Jan 03 2024 Josh Stone - 1.74.1-1 -- Update to 1.74.1. - -* Tue Oct 17 2023 Josh Stone - 1.73.0-1 -- Update to 1.73.0. -- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc - -* Thu Oct 12 2023 Josh Stone - 1.72.1-1 -- Update to 1.72.1. -- Migrated to SPDX license - -* Tue Aug 08 2023 Josh Stone - 1.71.1-1 -- Update to 1.71.1. -- Security fix for CVE-2023-38497 - -* Wed Jul 26 2023 Josh Stone - 1.71.0-2 -- Relax the suspicious_double_ref_op lint (rhbz2225471) -- Enable the profiler runtime for native hosts (rhbz2213875) - -* Thu Jul 20 2023 Josh Stone - 1.71.0-1 -- Update to 1.71.0. - -* Tue Jul 18 2023 Josh Stone - 1.70.0-1 -- Update to 1.70.0. - -* Fri May 26 2023 Josh Stone - 1.69.0-1 -- Update to 1.69.0. -- Obsolete rust-analysis. - -* Fri May 19 2023 Josh Stone - 1.68.2-1 -- Update to 1.68.2. - -* Thu May 18 2023 Josh Stone - 1.67.1-1 -- Update to 1.67.1. - -* Wed Jan 11 2023 Josh Stone - 1.66.1-1 -- Update to 1.66.1. - -* Fri Jan 06 2023 Josh Stone - 1.65.0-1 -- Update to 1.65.0. -- rust-analyzer now obsoletes rls. - -* Thu Sep 22 2022 Josh Stone - 1.64.0-1 -- Update to 1.64.0. -- Add rust-analyzer. - -* Wed Sep 07 2022 Josh Stone - 1.63.0-1 -- Update to 1.63.0. - -* Tue Jul 19 2022 Josh Stone - 1.62.1-1 -- Update to 1.62.1. - -* Wed Jul 13 2022 Josh Stone - 1.62.0-2 -- Prevent unsound coercions from functions with opaque return types. - -* Thu Jun 30 2022 Josh Stone - 1.62.0-1 -- Update to 1.62.0. - -* Fri Jun 03 2022 Josh Stone - 1.61.0-1 -- Update to 1.61.0. -- Add rust-toolset as a subpackage. - -* Wed Apr 20 2022 Josh Stone - 1.60.0-1 -- Update to 1.60.0. - -* Tue Apr 19 2022 Josh Stone - 1.59.0-1 -- Update to 1.59.0. - -* Thu Jan 20 2022 Josh Stone - 1.58.1-1 -- Update to 1.58.1. - -* Thu Jan 13 2022 Josh Stone - 1.58.0-1 -- Update to 1.58.0. - -* Wed Dec 15 2021 Josh Stone - 1.57.0-1 -- Update to 1.57.0. - -* Thu Dec 02 2021 Josh Stone - 1.56.1-2 -- Add rust-std-static-wasm32-wasi - Resolves: rhbz#1980080 - -* Tue Nov 02 2021 Josh Stone - 1.56.0-1 -- Update to 1.56.1. - -* Fri Oct 29 2021 Josh Stone - 1.55.0-1 -- Update to 1.55.0. -- Backport support for LLVM 13. - -* Tue Aug 17 2021 Josh Stone - 1.54.0-2 -- Make std-static-wasm* arch-specific to avoid s390x. - -* Thu Jul 29 2021 Josh Stone - 1.54.0-1 -- Update to 1.54.0. - -* Tue Jul 20 2021 Josh Stone - 1.53.0-2 -- Use llvm-ranlib to fix wasm archives. - -* Mon Jun 21 2021 Josh Stone - 1.53.0-1 -- Update to 1.53.0. - -* Tue Jun 15 2021 Josh Stone - 1.52.1-2 -- Set rust.codegen-units-std=1 for all targets again. -- Add rust-std-static-wasm32-unknown-unknown. - -* Tue May 25 2021 Josh Stone - 1.52.1-1 -- Update to 1.52.1. Includes security fixes for CVE-2020-36323, - CVE-2021-28876, CVE-2021-28878, CVE-2021-28879, and CVE-2021-31162. - -* Mon May 24 2021 Josh Stone - 1.51.0-1 -- Update to 1.51.0. Update to 1.51.0. Includes security fixes for - CVE-2021-28875 and CVE-2021-28877. - -* Mon May 24 2021 Josh Stone - 1.50.0-1 -- Update to 1.50.0. - -* Wed Jan 13 2021 Josh Stone - 1.49.0-1 -- Update to 1.49.0. - -* Tue Jan 12 2021 Josh Stone - 1.48.0-1 -- Update to 1.48.0. - -* Thu Oct 22 2020 Josh Stone - 1.47.0-1 -- Update to 1.47.0. - -* Wed Oct 14 2020 Josh Stone - 1.46.0-1 -- Update to 1.46.0. - -* Tue Aug 04 2020 Josh Stone - 1.45.2-1 -- Update to 1.45.2. - -* Thu Jul 16 2020 Josh Stone - 1.45.0-1 -- Update to 1.45.0. - -* Tue Jul 14 2020 Josh Stone - 1.44.1-1 -- Update to 1.44.1. - -* Thu May 07 2020 Josh Stone - 1.43.1-1 -- Update to 1.43.1. - -* Thu Apr 23 2020 Josh Stone - 1.43.0-1 -- Update to 1.43.0. - -* Thu Mar 12 2020 Josh Stone - 1.42.0-1 -- Update to 1.42.0. - -* Thu Feb 27 2020 Josh Stone - 1.41.1-1 -- Update to 1.41.1. - -* Thu Jan 30 2020 Josh Stone - 1.41.0-1 -- Update to 1.41.0. - -* Thu Jan 16 2020 Josh Stone - 1.40.0-1 -- Update to 1.40.0. -- Fix compiletest with newer (local-rebuild) libtest -- Build compiletest with in-tree libtest -- Fix ARM EHABI unwinding - -* Tue Nov 12 2019 Josh Stone - 1.39.0-2 -- Fix a couple build and test issues with rustdoc. - -* Thu Nov 07 2019 Josh Stone - 1.39.0-1 -- Update to 1.39.0. - -* Thu Sep 26 2019 Josh Stone - 1.38.0-1 -- Update to 1.38.0. - -* Thu Aug 15 2019 Josh Stone - 1.37.0-1 -- Update to 1.37.0. -- Disable libssh2 (git+ssh support). - -* Thu Jul 04 2019 Josh Stone - 1.36.0-1 -- Update to 1.36.0. - -* Wed May 29 2019 Josh Stone - 1.35.0-2 -- Fix compiletest for rebuild testing. - -* Thu May 23 2019 Josh Stone - 1.35.0-1 -- Update to 1.35.0. - -* Tue May 14 2019 Josh Stone - 1.34.2-1 -- Update to 1.34.2 -- fixes CVE-2019-12083. - -* Thu May 09 2019 Josh Stone - 1.34.1-1 -- Update to 1.34.1. - -* Thu Apr 11 2019 Josh Stone - 1.34.0-1 -- Update to 1.34.0. - -* Wed Apr 10 2019 Josh Stone - 1.33.0-1 -- Update to 1.33.0. - -* Tue Apr 09 2019 Josh Stone - 1.32.0-1 -- Update to 1.32.0. - -* Fri Dec 14 2018 Josh Stone - 1.31.0-5 -- Restore rust-lldb. - -* Thu Dec 13 2018 Josh Stone - 1.31.0-4 -- Backport fixes for rls. - -* Thu Dec 13 2018 Josh Stone - 1.31.0-3 -- Update to 1.31.0 -- Rust 2018! -- clippy/rls/rustfmt are no longer -preview - -* Wed Dec 12 2018 Josh Stone - 1.30.1-2 -- Update to 1.30.1. - -* Tue Nov 06 2018 Josh Stone - 1.29.2-1 -- Update to 1.29.2. - -* Thu Nov 01 2018 Josh Stone - 1.28.0-1 -- Update to 1.28.0. - -* Thu Nov 01 2018 Josh Stone - 1.27.2-1 -- Update to 1.27.2. - -* Wed Oct 10 2018 Josh Stone - 1.26.2-12 -- Fix "fp" target feature for AArch64 (#1632880) - -* Mon Oct 08 2018 Josh Stone - 1.26.2-11 -- Security fix for str::repeat (pending CVE). - -* Fri Oct 05 2018 Josh Stone - 1.26.2-10 -- Rebuild without bootstrap binaries. - -* Thu Oct 04 2018 Josh Stone - 1.26.2-9 -- Bootstrap without SCL packaging. (rhbz1635067) - -* Tue Aug 28 2018 Tom Stellard - 1.26.2-8 -- Use python3 prefix for lldb Requires - -* Mon Aug 13 2018 Josh Stone - 1.26.2-7 -- Build with platform-python - -* Tue Aug 07 2018 Josh Stone - 1.26.2-6 -- Exclude rust-src from auto-requires - -* Thu Aug 02 2018 Josh Stone - 1.26.2-5 -- Rebuild without bootstrap binaries. - -* Tue Jul 31 2018 Josh Stone - 1.26.2-4 -- Bootstrap as a module. - -* Mon Jun 04 2018 Josh Stone - 1.26.2-3 -- Update to 1.26.2. - -* Wed May 30 2018 Josh Stone - 1.26.1-2 -- Update to 1.26.1. - -* Fri May 18 2018 Josh Stone - 1.26.0-1 -- Update to 1.26.0. - -* Tue Apr 10 2018 Josh Stone - 1.25.0-2 -- Filter codegen-backends from Provides too. - -* Tue Apr 03 2018 Josh Stone - 1.25.0-1 -- Update to 1.25.0. -- Add rustfmt-preview as a subpackage. - -* Thu Feb 22 2018 Josh Stone - 1.24.0-1 -- Update to 1.24.0. - -* Tue Jan 16 2018 Josh Stone - 1.23.0-2 -- Rebuild without bootstrap binaries. - -* Mon Jan 15 2018 Josh Stone - 1.23.0-1 -- Bootstrap 1.23 on el8. +%autochangelog From b577ee9df181326baa61e5c8e7501eb3616bb24e Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 11 Jul 2025 12:15:24 -0700 Subject: [PATCH 5/6] Update to Rust 1.88.0 Resolves: RHEL-81602 Resolves: RHEL-81630 --- .gitignore | 1 + ...ltins-build-script-to-handle-full-pa.patch | 42 ---------- rpminspect.yaml | 2 + rust-pr142047.patch | 79 +++++++++++++++++++ rust.spec | 42 +++++----- rustc-1.87.0-unbundle-sqlite.patch | 23 ------ ...atch => rustc-1.88.0-disable-libssh2.patch | 22 +++--- rustc-1.88.0-unbundle-sqlite.patch | 23 ++++++ sources | 2 +- 9 files changed, 138 insertions(+), 98 deletions(-) delete mode 100644 0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch create mode 100644 rust-pr142047.patch delete mode 100644 rustc-1.87.0-unbundle-sqlite.patch rename rustc-1.86.0-disable-libssh2.patch => rustc-1.88.0-disable-libssh2.patch (53%) create mode 100644 rustc-1.88.0-unbundle-sqlite.patch diff --git a/.gitignore b/.gitignore index 61b26cb..b77fb07 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ SOURCES/wasi-libc-wasi-sdk-17.tar.gz /rustc-1.86.0-src.tar.xz /wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz /rustc-1.87.0-src.tar.xz +/rustc-1.88.0-src.tar.xz diff --git a/0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch b/0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch deleted file mode 100644 index 2746541..0000000 --- a/0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dc0fbcab7e0673afe62b3e8e74905d9e5f5b74a4 Mon Sep 17 00:00:00 2001 -From: Jesus Checa Hidalgo -Date: Fri, 11 Apr 2025 16:57:38 +0200 -Subject: [PATCH] Fix profiler_builtins build script to handle full path to - profiler lib - -LLVM_PROFILER_RT_LIB may be set to an absolute path (e.g., in Fedora builds), -but `-l` expects a library name, not a path. After #138273, this caused builds -to fail with a "could not find native static library" error. - -This patch updates the build script to split the path into directory and -filename, using `cargo::rustc-link-search` for the directory and -`cargo::rustc-link-lib=+verbatim` for the file. This allows profiler_builtins to -correctly link the static library even when an absolute path is provided. ---- - library/profiler_builtins/build.rs | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/library/profiler_builtins/build.rs b/library/profiler_builtins/build.rs -index dd85239fa8c..fc1a9ecc1ec 100644 ---- a/library/profiler_builtins/build.rs -+++ b/library/profiler_builtins/build.rs -@@ -9,8 +9,14 @@ - - fn main() { - if let Ok(rt) = tracked_env_var("LLVM_PROFILER_RT_LIB") { -- println!("cargo::rustc-link-lib=static:+verbatim={rt}"); -- return; -+ let rt = PathBuf::from(rt); -+ if let Some(lib) = rt.file_name() { -+ if let Some(dir) = rt.parent() { -+ println!("cargo::rustc-link-search=native={}", dir.display()); -+ } -+ println!("cargo::rustc-link-lib=static:+verbatim={}", lib.to_str().unwrap()); -+ return; -+ } - } - - let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS was not set"); --- -2.49.0 - diff --git a/rpminspect.yaml b/rpminspect.yaml index b9008c7..ca2acb2 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -23,6 +23,8 @@ unicode: - rustc-*-src/vendor/idna-*/tests/IdnaTestV2.txt - rustc-*-src/vendor/mdbook*/tests/dummy_book/src/first/unicode.md - rustc-*-src/vendor/mdbook*/tests/searchindex_fixture.json + - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/expected_index.js + - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/src/first/unicode.md - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-string?.wat - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-block-comment?.wat - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-line-comment?.wat diff --git a/rust-pr142047.patch b/rust-pr142047.patch new file mode 100644 index 0000000..d64d71d --- /dev/null +++ b/rust-pr142047.patch @@ -0,0 +1,79 @@ +From 925e76167ce2465c5c9d990d97c2db99f459640b Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Wed, 4 Jun 2025 15:03:19 -0700 +Subject: [PATCH 1/2] Ensure stack in `ThirBuildCx::mirror_exprs` + +This solve a stack overflow found on Fedora s390x when building +`tests/ui/parser/survive-peano-lesson-queue.rs`. Note that the singular +`mirror_expr` method already has this stack check, but in this case the +plural method was the one recursing too deeply. +--- + compiler/rustc_mir_build/src/thir/cx/expr.rs | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/compiler/rustc_mir_build/src/thir/cx/expr.rs b/compiler/rustc_mir_build/src/thir/cx/expr.rs +index 226dc920a496c..78c168778ac9d 100644 +--- a/compiler/rustc_mir_build/src/thir/cx/expr.rs ++++ b/compiler/rustc_mir_build/src/thir/cx/expr.rs +@@ -38,7 +38,10 @@ impl<'tcx> ThirBuildCx<'tcx> { + } + + pub(crate) fn mirror_exprs(&mut self, exprs: &'tcx [hir::Expr<'tcx>]) -> Box<[ExprId]> { +- exprs.iter().map(|expr| self.mirror_expr_inner(expr)).collect() ++ // `mirror_exprs` may also recurse deeply, so it needs protection from stack overflow. ++ // Note that we *could* forward to `mirror_expr` for that, but we can consolidate the ++ // overhead of stack growth by doing it outside the iteration. ++ ensure_sufficient_stack(|| exprs.iter().map(|expr| self.mirror_expr_inner(expr)).collect()) + } + + #[instrument(level = "trace", skip(self, hir_expr))] + +From af2a85bd75c011fb3453a4963400918e096e1896 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Wed, 4 Jun 2025 15:16:38 -0700 +Subject: [PATCH 2/2] Ensure stack in `Parser::parse_ty` + +This solve a stack overflow found on Fedora s390x when building +`tests/ui/associated-consts/issue-93775.rs`. +--- + compiler/rustc_parse/src/parser/ty.rs | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs +index 17481731b1107..6eaec2e29ad48 100644 +--- a/compiler/rustc_parse/src/parser/ty.rs ++++ b/compiler/rustc_parse/src/parser/ty.rs +@@ -7,6 +7,7 @@ use rustc_ast::{ + Pinnedness, PolyTraitRef, PreciseCapturingArg, TraitBoundModifiers, TraitObjectSyntax, Ty, + TyKind, UnsafeBinderTy, + }; ++use rustc_data_structures::stack::ensure_sufficient_stack; + use rustc_errors::{Applicability, Diag, PResult}; + use rustc_span::{ErrorGuaranteed, Ident, Span, kw, sym}; + use thin_vec::{ThinVec, thin_vec}; +@@ -104,14 +105,17 @@ fn can_begin_dyn_bound_in_edition_2015(t: &Token) -> bool { + impl<'a> Parser<'a> { + /// Parses a type. + pub fn parse_ty(&mut self) -> PResult<'a, P> { +- self.parse_ty_common( +- AllowPlus::Yes, +- AllowCVariadic::No, +- RecoverQPath::Yes, +- RecoverReturnSign::Yes, +- None, +- RecoverQuestionMark::Yes, +- ) ++ // Make sure deeply nested types don't overflow the stack. ++ ensure_sufficient_stack(|| { ++ self.parse_ty_common( ++ AllowPlus::Yes, ++ AllowCVariadic::No, ++ RecoverQPath::Yes, ++ RecoverReturnSign::Yes, ++ None, ++ RecoverQuestionMark::Yes, ++ ) ++ }) + } + + pub(super) fn parse_ty_with_generics_recovery( diff --git a/rust.spec b/rust.spec index 7b2ef3e..f40f82e 100644 --- a/rust.spec +++ b/rust.spec @@ -1,5 +1,5 @@ Name: rust -Version: 1.87.0 +Version: 1.88.0 Release: %autorelease Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0) @@ -11,12 +11,12 @@ URL: https://www.rust-lang.org %global rust_arches x86_64 i686 aarch64 ppc64le s390x ExclusiveArch: %{rust_arches} -# To bootstrap from scratch, set the channel and date from src/stage0.json -# e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13 +# To bootstrap from scratch, set the channel and date from src/stage0 +# e.g. 1.88.0 wants rustc: 1.87.0-2025-05-15 # or nightly wants some beta-YYYY-MM-DD -%global bootstrap_version 1.86.0 -%global bootstrap_channel 1.86.0 -%global bootstrap_date 2025-04-03 +%global bootstrap_version 1.87.0 +%global bootstrap_channel 1.87.0 +%global bootstrap_date 2025-05-15 # Only the specified arches will use bootstrap binaries. # NOTE: Those binaries used to be uploaded with every new release, but that was @@ -43,9 +43,10 @@ ExclusiveArch: %{rust_arches} %bcond_with llvm_static # We can also choose to just use Rust's bundled LLVM, in case the system LLVM -# is insufficient. Rust currently requires LLVM 18.0+. -%global min_llvm_version 18.0.0 -%global bundled_llvm_version 20.1.1 +# is insufficient. Rust currently requires LLVM 19.0+. +# See src/bootstrap/src/core/build_steps/llvm.rs, fn check_llvm_version +%global min_llvm_version 19.0.0 +%global bundled_llvm_version 20.1.5 #global llvm_compat_version 19 %global llvm llvm%{?llvm_compat_version} %bcond_with bundled_llvm @@ -72,7 +73,7 @@ ExclusiveArch: %{rust_arches} # Cargo uses UPSERTs with omitted conflict targets %global min_sqlite3_version 3.35 -%global bundled_sqlite3_version 3.48.0 +%global bundled_sqlite3_version 3.49.1 %if 0%{?rhel} && 0%{?rhel} < 10 %bcond_without bundled_sqlite3 %else @@ -138,11 +139,11 @@ Patch4: 0001-bootstrap-allow-disabling-target-self-contained.patch Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch # We don't want to use the bundled library in libsqlite3-sys -Patch6: rustc-1.87.0-unbundle-sqlite.patch +Patch6: rustc-1.88.0-unbundle-sqlite.patch -# Split the absolute path of libclang_rt.profile.a when passed to profiler_builtns -# Upstream PR: https://github.com/rust-lang/rust/pull/139677 -Patch7: 0001-Fix-profiler_builtins-build-script-to-handle-full-pa.patch +# Ensure stack in two places that affect s390x +# https://github.com/rust-lang/rust/pull/142047 +Patch7: rust-pr142047.patch ### RHEL-specific patches below ### @@ -152,7 +153,7 @@ Source101: cargo_vendor.attr Source102: cargo_vendor.prov # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949) -Patch100: rustc-1.86.0-disable-libssh2.patch +Patch100: rustc-1.88.0-disable-libssh2.patch # Get the Rust triple for any architecture and ABI. %{lua: function rust_triple(arch, abi) @@ -314,7 +315,7 @@ Provides: rustc%{?_isa} = %{version}-%{release} # Always require our exact standard library Requires: %{name}-std-static%{?_isa} = %{version}-%{release} -# The C compiler is needed at runtime just for linking. Someday rustc might +# The C compiler is needed at runtime just for linking. Someday rustc might # invoke the linker directly, and then we'll only need binutils. # https://github.com/rust-lang/rust/issues/11937 Requires: /usr/bin/cc @@ -554,7 +555,7 @@ BuildRequires: git-core # in sync since some feature development depends on them together. Requires: %{name} = %{version}-%{release} -# "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and +# "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and # Provides are mostly relevant to RHEL, but harmless to have on Fedora/etc. too Obsoletes: cargo-vendor <= 0.1.23 Provides: cargo-vendor = %{version}-%{release} @@ -620,7 +621,7 @@ BuildArch: noarch Recommends: %{name}-std-static = %{version}-%{release} %description src -This package includes source files for the Rust standard library. It may be +This package includes source files for the Rust standard library. It may be useful as a reference for code completion tools in various editors. @@ -670,7 +671,6 @@ rm -rf %{wasi_libc_dir}/dlmalloc/ %if %without bundled_sqlite3 %patch -P6 -p1 %endif - %patch -P7 -p1 %if %with disabled_libssh2 @@ -733,7 +733,7 @@ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \ %endif # The configure macro will modify some autoconf-related files, which upsets -# cargo when it tries to verify checksums in those files. If we just truncate +# cargo when it tries to verify checksums in those files. If we just truncate # that file list, cargo won't have anything to complain about. find vendor -name .cargo-checksum.json \ -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+' @@ -778,7 +778,7 @@ end} # Some builders have relatively little memory for their CPU count. # At least 4GB per CPU is a good rule of thumb for building rustc. -%if ! %defined constrain_build +%if %undefined constrain_build %define constrain_build(m:) %{lua: for l in io.lines('/proc/meminfo') do if l:sub(1, 9) == "MemTotal:" then diff --git a/rustc-1.87.0-unbundle-sqlite.patch b/rustc-1.87.0-unbundle-sqlite.patch deleted file mode 100644 index da0fa26..0000000 --- a/rustc-1.87.0-unbundle-sqlite.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 2025-03-11 15:30:39.383119717 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-03-11 15:32:12.486164705 -0700 -@@ -2571,7 +2571,6 @@ version = "0.31.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ad8935b44e7c13394a179a438e0cebba0fe08fe01b54f152e29a93b5cf993fd4" - dependencies = [ -- "cc", - "pkg-config", - "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 2025-04-07 20:37:44.467359012 +0200 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-04-07 20:38:17.564060339 +0200 -@@ -79,7 +79,7 @@ proptest = "1.6.0" - pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } - rand = "0.9.0" - regex = "1.11.1" --rusqlite = { version = "0.33.0", features = ["bundled"] } -+rusqlite = { version = "0.33.0", features = [] } - rustc-hash = "2.1.1" - rustc-stable-hash = "0.1.2" - rustfix = { version = "0.9.0", path = "crates/rustfix" } diff --git a/rustc-1.86.0-disable-libssh2.patch b/rustc-1.88.0-disable-libssh2.patch similarity index 53% rename from rustc-1.86.0-disable-libssh2.patch rename to rustc-1.88.0-disable-libssh2.patch index 8b07bde..bf39d35 100644 --- a/rustc-1.86.0-disable-libssh2.patch +++ b/rustc-1.88.0-disable-libssh2.patch @@ -1,7 +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 2025-03-11 15:36:38.387335541 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-03-11 15:39:27.491711044 -0700 -@@ -2528,7 +2528,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-06-13 15:47:08.609927319 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-06-13 15:47:54.463092386 -0700 +@@ -2530,7 +2530,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c dependencies = [ "cc", "libc", @@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "libz-sys", "openssl-sys", "pkg-config", -@@ -2574,20 +2573,6 @@ dependencies = [ +@@ -2576,20 +2575,6 @@ dependencies = [ "pkg-config", "vcpkg", ] @@ -29,16 +29,16 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools -] [[package]] - name = "libz-sys" + name = "libz-rs-sys" 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 2025-03-11 15:36:38.389045348 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-03-11 15:38:36.948228456 -0700 -@@ -47,7 +47,7 @@ curl = "0.4.47" +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-06-13 15:47:08.610402846 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-06-13 15:47:51.696071356 -0700 +@@ -46,7 +46,7 @@ curl = "0.4.47" curl-sys = "0.4.79" filetime = "0.2.25" - flate2 = { version = "1.0.35", default-features = false, features = ["zlib"] } + flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] } -git2 = "0.20.0" +git2 = { version = "0.20.0", default-features = false, features = ["https"] } git2-curl = "0.21.0" - gix = { version = "0.70.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } - glob = "0.3.2" + # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail. + gix = { version = "0.71.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } diff --git a/rustc-1.88.0-unbundle-sqlite.patch b/rustc-1.88.0-unbundle-sqlite.patch new file mode 100644 index 0000000..11c1e79 --- /dev/null +++ b/rustc-1.88.0-unbundle-sqlite.patch @@ -0,0 +1,23 @@ +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 2025-06-13 01:10:18.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-06-13 15:39:38.597882622 -0700 +@@ -2573,7 +2573,6 @@ version = "0.32.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fbb8270bb4060bd76c6e96f20c52d80620f1d82a3470885694e41e0f81ef6fe7" + dependencies = [ +- "cc", + "pkg-config", + "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 2025-06-13 01:10:18.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-06-13 15:39:34.583102112 -0700 +@@ -80,7 +80,7 @@ proptest = "1.6.0" + pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } + rand = "0.9.0" + regex = "1.11.1" +-rusqlite = { version = "0.34.0", features = ["bundled"] } ++rusqlite = { version = "0.34.0", features = [] } + rustc-hash = "2.1.1" + rustc-stable-hash = "0.1.2" + rustfix = { version = "0.9.0", path = "crates/rustfix" } diff --git a/sources b/sources index a5e7cd0..79ee571 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rustc-1.87.0-src.tar.xz) = 2ef08c9be45434401f916d54b3739f52d255f8a3a4ce05a717499250c2333eeaf601f1d18085b878c027c609f44da74d0151f5bfc2c9ae1e01166919a91a1d2b +SHA512 (rustc-1.88.0-src.tar.xz) = e6c62af2953f49462b2369e9551b12f2bec114577f90e3e76049636da4279b1e7f4d53bc6896f5d0d4715d90ef6d29dacff529a45690ffac6af62ad64600db40 SHA512 (wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz) = 7626200112b6e55567855b950baf7c9eeaf47e7de34a30eb9e8b785e0e03063197102d2f39d0846055d6aab7c06232f947a6b8af3dda62c8f02ea39d8f765a5e From ceea680986f03a94821b3086bf44626880434125 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 11 Jul 2025 14:49:25 -0700 Subject: [PATCH 6/6] Revert "Convert to %autorelease and %autochangelog" This reverts commit 88c2b175533b12f2f271c7610be74714282afc9d. Resolves: RHEL-81602 Resolves: RHEL-81630 --- changelog | 315 ----------------------------------------------------- rust.spec | 321 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 319 insertions(+), 317 deletions(-) delete mode 100644 changelog diff --git a/changelog b/changelog deleted file mode 100644 index 763960c..0000000 --- a/changelog +++ /dev/null @@ -1,315 +0,0 @@ -* Thu May 29 2025 Josh Stone - 1.87.0-1 -- Update to 1.87.0 - -* Wed Apr 30 2025 Josh Stone - 1.86.0-1 -- Update to 1.86.0 - -* Tue Apr 29 2025 Josh Stone - 1.85.0-1 -- Update to 1.85.0 - -* Tue Feb 04 2025 Josh Stone - 1.84.1-1 -- Update to 1.84.1 - -* Wed Jan 15 2025 Josh Stone - 1.84.0-1 -- Update to 1.84.0 - -* Thu Dec 05 2024 Josh Stone - 1.83.0-1 -- Update to 1.83.0 -- Remove the subshell in the cargo_install macro - -* Tue Nov 05 2024 Josh Stone - 1.82.0-1 -- Update to 1.82.0 - -* Fri Oct 25 2024 Josh Stone - 1.81.0-1 -- Update to 1.81.0 - -* Tue Oct 22 2024 Josh Stone - 1.80.1-1 -- Update to 1.80.1 - -* Tue Aug 13 2024 Josh Stone - 1.79.0-2 -- Disable jump threading of float equality - -* Fri Jun 21 2024 Josh Stone - 1.79.0-1 -- Update to 1.79.0 - -* Fri Jun 21 2024 Josh Stone - 1.78.0-1 -- Update to 1.78.0 -- Make std-static-wasm* noarch again - -* Thu May 09 2024 Josh Stone - 1.77.2-1 -- Update to 1.77.2. - -* Wed Apr 17 2024 Josh Stone - 1.76.0-1 -- Update to 1.76.0. -- Sync rust-toolset macros to rust-packaging v25.2 - -* Fri Jan 05 2024 Josh Stone - 1.75.0-1 -- Update to 1.75.0. - -* Wed Jan 03 2024 Josh Stone - 1.74.1-1 -- Update to 1.74.1. - -* Tue Oct 17 2023 Josh Stone - 1.73.0-1 -- Update to 1.73.0. -- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc - -* Thu Oct 12 2023 Josh Stone - 1.72.1-1 -- Update to 1.72.1. -- Migrated to SPDX license - -* Tue Aug 08 2023 Josh Stone - 1.71.1-1 -- Update to 1.71.1. -- Security fix for CVE-2023-38497 - -* Wed Jul 26 2023 Josh Stone - 1.71.0-2 -- Relax the suspicious_double_ref_op lint (rhbz2225471) -- Enable the profiler runtime for native hosts (rhbz2213875) - -* Thu Jul 20 2023 Josh Stone - 1.71.0-1 -- Update to 1.71.0. - -* Tue Jul 18 2023 Josh Stone - 1.70.0-1 -- Update to 1.70.0. - -* Fri May 26 2023 Josh Stone - 1.69.0-1 -- Update to 1.69.0. -- Obsolete rust-analysis. - -* Fri May 19 2023 Josh Stone - 1.68.2-1 -- Update to 1.68.2. - -* Thu May 18 2023 Josh Stone - 1.67.1-1 -- Update to 1.67.1. - -* Wed Jan 11 2023 Josh Stone - 1.66.1-1 -- Update to 1.66.1. - -* Fri Jan 06 2023 Josh Stone - 1.65.0-1 -- Update to 1.65.0. -- rust-analyzer now obsoletes rls. - -* Thu Sep 22 2022 Josh Stone - 1.64.0-1 -- Update to 1.64.0. -- Add rust-analyzer. - -* Wed Sep 07 2022 Josh Stone - 1.63.0-1 -- Update to 1.63.0. - -* Tue Jul 19 2022 Josh Stone - 1.62.1-1 -- Update to 1.62.1. - -* Wed Jul 13 2022 Josh Stone - 1.62.0-2 -- Prevent unsound coercions from functions with opaque return types. - -* Thu Jun 30 2022 Josh Stone - 1.62.0-1 -- Update to 1.62.0. - -* Fri Jun 03 2022 Josh Stone - 1.61.0-1 -- Update to 1.61.0. -- Add rust-toolset as a subpackage. - -* Wed Apr 20 2022 Josh Stone - 1.60.0-1 -- Update to 1.60.0. - -* Tue Apr 19 2022 Josh Stone - 1.59.0-1 -- Update to 1.59.0. - -* Thu Jan 20 2022 Josh Stone - 1.58.1-1 -- Update to 1.58.1. - -* Thu Jan 13 2022 Josh Stone - 1.58.0-1 -- Update to 1.58.0. - -* Wed Dec 15 2021 Josh Stone - 1.57.0-1 -- Update to 1.57.0. - -* Thu Dec 02 2021 Josh Stone - 1.56.1-2 -- Add rust-std-static-wasm32-wasi - Resolves: rhbz#1980080 - -* Tue Nov 02 2021 Josh Stone - 1.56.0-1 -- Update to 1.56.1. - -* Fri Oct 29 2021 Josh Stone - 1.55.0-1 -- Update to 1.55.0. -- Backport support for LLVM 13. - -* Tue Aug 17 2021 Josh Stone - 1.54.0-2 -- Make std-static-wasm* arch-specific to avoid s390x. - -* Thu Jul 29 2021 Josh Stone - 1.54.0-1 -- Update to 1.54.0. - -* Tue Jul 20 2021 Josh Stone - 1.53.0-2 -- Use llvm-ranlib to fix wasm archives. - -* Mon Jun 21 2021 Josh Stone - 1.53.0-1 -- Update to 1.53.0. - -* Tue Jun 15 2021 Josh Stone - 1.52.1-2 -- Set rust.codegen-units-std=1 for all targets again. -- Add rust-std-static-wasm32-unknown-unknown. - -* Tue May 25 2021 Josh Stone - 1.52.1-1 -- Update to 1.52.1. Includes security fixes for CVE-2020-36323, - CVE-2021-28876, CVE-2021-28878, CVE-2021-28879, and CVE-2021-31162. - -* Mon May 24 2021 Josh Stone - 1.51.0-1 -- Update to 1.51.0. Update to 1.51.0. Includes security fixes for - CVE-2021-28875 and CVE-2021-28877. - -* Mon May 24 2021 Josh Stone - 1.50.0-1 -- Update to 1.50.0. - -* Wed Jan 13 2021 Josh Stone - 1.49.0-1 -- Update to 1.49.0. - -* Tue Jan 12 2021 Josh Stone - 1.48.0-1 -- Update to 1.48.0. - -* Thu Oct 22 2020 Josh Stone - 1.47.0-1 -- Update to 1.47.0. - -* Wed Oct 14 2020 Josh Stone - 1.46.0-1 -- Update to 1.46.0. - -* Tue Aug 04 2020 Josh Stone - 1.45.2-1 -- Update to 1.45.2. - -* Thu Jul 16 2020 Josh Stone - 1.45.0-1 -- Update to 1.45.0. - -* Tue Jul 14 2020 Josh Stone - 1.44.1-1 -- Update to 1.44.1. - -* Thu May 07 2020 Josh Stone - 1.43.1-1 -- Update to 1.43.1. - -* Thu Apr 23 2020 Josh Stone - 1.43.0-1 -- Update to 1.43.0. - -* Thu Mar 12 2020 Josh Stone - 1.42.0-1 -- Update to 1.42.0. - -* Thu Feb 27 2020 Josh Stone - 1.41.1-1 -- Update to 1.41.1. - -* Thu Jan 30 2020 Josh Stone - 1.41.0-1 -- Update to 1.41.0. - -* Thu Jan 16 2020 Josh Stone - 1.40.0-1 -- Update to 1.40.0. -- Fix compiletest with newer (local-rebuild) libtest -- Build compiletest with in-tree libtest -- Fix ARM EHABI unwinding - -* Tue Nov 12 2019 Josh Stone - 1.39.0-2 -- Fix a couple build and test issues with rustdoc. - -* Thu Nov 07 2019 Josh Stone - 1.39.0-1 -- Update to 1.39.0. - -* Thu Sep 26 2019 Josh Stone - 1.38.0-1 -- Update to 1.38.0. - -* Thu Aug 15 2019 Josh Stone - 1.37.0-1 -- Update to 1.37.0. -- Disable libssh2 (git+ssh support). - -* Thu Jul 04 2019 Josh Stone - 1.36.0-1 -- Update to 1.36.0. - -* Wed May 29 2019 Josh Stone - 1.35.0-2 -- Fix compiletest for rebuild testing. - -* Thu May 23 2019 Josh Stone - 1.35.0-1 -- Update to 1.35.0. - -* Tue May 14 2019 Josh Stone - 1.34.2-1 -- Update to 1.34.2 -- fixes CVE-2019-12083. - -* Thu May 09 2019 Josh Stone - 1.34.1-1 -- Update to 1.34.1. - -* Thu Apr 11 2019 Josh Stone - 1.34.0-1 -- Update to 1.34.0. - -* Wed Apr 10 2019 Josh Stone - 1.33.0-1 -- Update to 1.33.0. - -* Tue Apr 09 2019 Josh Stone - 1.32.0-1 -- Update to 1.32.0. - -* Fri Dec 14 2018 Josh Stone - 1.31.0-5 -- Restore rust-lldb. - -* Thu Dec 13 2018 Josh Stone - 1.31.0-4 -- Backport fixes for rls. - -* Thu Dec 13 2018 Josh Stone - 1.31.0-3 -- Update to 1.31.0 -- Rust 2018! -- clippy/rls/rustfmt are no longer -preview - -* Wed Dec 12 2018 Josh Stone - 1.30.1-2 -- Update to 1.30.1. - -* Tue Nov 06 2018 Josh Stone - 1.29.2-1 -- Update to 1.29.2. - -* Thu Nov 01 2018 Josh Stone - 1.28.0-1 -- Update to 1.28.0. - -* Thu Nov 01 2018 Josh Stone - 1.27.2-1 -- Update to 1.27.2. - -* Wed Oct 10 2018 Josh Stone - 1.26.2-12 -- Fix "fp" target feature for AArch64 (#1632880) - -* Mon Oct 08 2018 Josh Stone - 1.26.2-11 -- Security fix for str::repeat (pending CVE). - -* Fri Oct 05 2018 Josh Stone - 1.26.2-10 -- Rebuild without bootstrap binaries. - -* Thu Oct 04 2018 Josh Stone - 1.26.2-9 -- Bootstrap without SCL packaging. (rhbz1635067) - -* Tue Aug 28 2018 Tom Stellard - 1.26.2-8 -- Use python3 prefix for lldb Requires - -* Mon Aug 13 2018 Josh Stone - 1.26.2-7 -- Build with platform-python - -* Tue Aug 07 2018 Josh Stone - 1.26.2-6 -- Exclude rust-src from auto-requires - -* Thu Aug 02 2018 Josh Stone - 1.26.2-5 -- Rebuild without bootstrap binaries. - -* Tue Jul 31 2018 Josh Stone - 1.26.2-4 -- Bootstrap as a module. - -* Mon Jun 04 2018 Josh Stone - 1.26.2-3 -- Update to 1.26.2. - -* Wed May 30 2018 Josh Stone - 1.26.1-2 -- Update to 1.26.1. - -* Fri May 18 2018 Josh Stone - 1.26.0-1 -- Update to 1.26.0. - -* Tue Apr 10 2018 Josh Stone - 1.25.0-2 -- Filter codegen-backends from Provides too. - -* Tue Apr 03 2018 Josh Stone - 1.25.0-1 -- Update to 1.25.0. -- Add rustfmt-preview as a subpackage. - -* Thu Feb 22 2018 Josh Stone - 1.24.0-1 -- Update to 1.24.0. - -* Tue Jan 16 2018 Josh Stone - 1.23.0-2 -- Rebuild without bootstrap binaries. - -* Mon Jan 15 2018 Josh Stone - 1.23.0-1 -- Bootstrap 1.23 on el8. diff --git a/rust.spec b/rust.spec index f40f82e..b7df812 100644 --- a/rust.spec +++ b/rust.spec @@ -1,6 +1,6 @@ Name: rust Version: 1.88.0 -Release: %autorelease +Release: 1%{?dist} Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0) # ^ written as: (rust itself) and (bundled libraries) @@ -1201,4 +1201,321 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %changelog -%autochangelog +* Fri Jul 11 2025 Josh Stone - 1.88.0-1 +- Update to 1.88.0 + +* Thu May 29 2025 Josh Stone - 1.87.0-1 +- Update to 1.87.0 + +* Wed Apr 30 2025 Josh Stone - 1.86.0-1 +- Update to 1.86.0 + +* Tue Apr 29 2025 Josh Stone - 1.85.0-1 +- Update to 1.85.0 + +* Tue Feb 04 2025 Josh Stone - 1.84.1-1 +- Update to 1.84.1 + +* Wed Jan 15 2025 Josh Stone - 1.84.0-1 +- Update to 1.84.0 + +* Thu Dec 05 2024 Josh Stone - 1.83.0-1 +- Update to 1.83.0 +- Remove the subshell in the cargo_install macro + +* Tue Nov 05 2024 Josh Stone - 1.82.0-1 +- Update to 1.82.0 + +* Fri Oct 25 2024 Josh Stone - 1.81.0-1 +- Update to 1.81.0 + +* Tue Oct 22 2024 Josh Stone - 1.80.1-1 +- Update to 1.80.1 + +* Tue Aug 13 2024 Josh Stone - 1.79.0-2 +- Disable jump threading of float equality + +* Fri Jun 21 2024 Josh Stone - 1.79.0-1 +- Update to 1.79.0 + +* Fri Jun 21 2024 Josh Stone - 1.78.0-1 +- Update to 1.78.0 +- Make std-static-wasm* noarch again + +* Thu May 09 2024 Josh Stone - 1.77.2-1 +- Update to 1.77.2. + +* Wed Apr 17 2024 Josh Stone - 1.76.0-1 +- Update to 1.76.0. +- Sync rust-toolset macros to rust-packaging v25.2 + +* Fri Jan 05 2024 Josh Stone - 1.75.0-1 +- Update to 1.75.0. + +* Wed Jan 03 2024 Josh Stone - 1.74.1-1 +- Update to 1.74.1. + +* Tue Oct 17 2023 Josh Stone - 1.73.0-1 +- Update to 1.73.0. +- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc + +* Thu Oct 12 2023 Josh Stone - 1.72.1-1 +- Update to 1.72.1. +- Migrated to SPDX license + +* Tue Aug 08 2023 Josh Stone - 1.71.1-1 +- Update to 1.71.1. +- Security fix for CVE-2023-38497 + +* Wed Jul 26 2023 Josh Stone - 1.71.0-2 +- Relax the suspicious_double_ref_op lint (rhbz2225471) +- Enable the profiler runtime for native hosts (rhbz2213875) + +* Thu Jul 20 2023 Josh Stone - 1.71.0-1 +- Update to 1.71.0. + +* Tue Jul 18 2023 Josh Stone - 1.70.0-1 +- Update to 1.70.0. + +* Fri May 26 2023 Josh Stone - 1.69.0-1 +- Update to 1.69.0. +- Obsolete rust-analysis. + +* Fri May 19 2023 Josh Stone - 1.68.2-1 +- Update to 1.68.2. + +* Thu May 18 2023 Josh Stone - 1.67.1-1 +- Update to 1.67.1. + +* Wed Jan 11 2023 Josh Stone - 1.66.1-1 +- Update to 1.66.1. + +* Fri Jan 06 2023 Josh Stone - 1.65.0-1 +- Update to 1.65.0. +- rust-analyzer now obsoletes rls. + +* Thu Sep 22 2022 Josh Stone - 1.64.0-1 +- Update to 1.64.0. +- Add rust-analyzer. + +* Wed Sep 07 2022 Josh Stone - 1.63.0-1 +- Update to 1.63.0. + +* Tue Jul 19 2022 Josh Stone - 1.62.1-1 +- Update to 1.62.1. + +* Wed Jul 13 2022 Josh Stone - 1.62.0-2 +- Prevent unsound coercions from functions with opaque return types. + +* Thu Jun 30 2022 Josh Stone - 1.62.0-1 +- Update to 1.62.0. + +* Fri Jun 03 2022 Josh Stone - 1.61.0-1 +- Update to 1.61.0. +- Add rust-toolset as a subpackage. + +* Wed Apr 20 2022 Josh Stone - 1.60.0-1 +- Update to 1.60.0. + +* Tue Apr 19 2022 Josh Stone - 1.59.0-1 +- Update to 1.59.0. + +* Thu Jan 20 2022 Josh Stone - 1.58.1-1 +- Update to 1.58.1. + +* Thu Jan 13 2022 Josh Stone - 1.58.0-1 +- Update to 1.58.0. + +* Wed Dec 15 2021 Josh Stone - 1.57.0-1 +- Update to 1.57.0. + +* Thu Dec 02 2021 Josh Stone - 1.56.1-2 +- Add rust-std-static-wasm32-wasi + Resolves: rhbz#1980080 + +* Tue Nov 02 2021 Josh Stone - 1.56.0-1 +- Update to 1.56.1. + +* Fri Oct 29 2021 Josh Stone - 1.55.0-1 +- Update to 1.55.0. +- Backport support for LLVM 13. + +* Tue Aug 17 2021 Josh Stone - 1.54.0-2 +- Make std-static-wasm* arch-specific to avoid s390x. + +* Thu Jul 29 2021 Josh Stone - 1.54.0-1 +- Update to 1.54.0. + +* Tue Jul 20 2021 Josh Stone - 1.53.0-2 +- Use llvm-ranlib to fix wasm archives. + +* Mon Jun 21 2021 Josh Stone - 1.53.0-1 +- Update to 1.53.0. + +* Tue Jun 15 2021 Josh Stone - 1.52.1-2 +- Set rust.codegen-units-std=1 for all targets again. +- Add rust-std-static-wasm32-unknown-unknown. + +* Tue May 25 2021 Josh Stone - 1.52.1-1 +- Update to 1.52.1. Includes security fixes for CVE-2020-36323, + CVE-2021-28876, CVE-2021-28878, CVE-2021-28879, and CVE-2021-31162. + +* Mon May 24 2021 Josh Stone - 1.51.0-1 +- Update to 1.51.0. Update to 1.51.0. Includes security fixes for + CVE-2021-28875 and CVE-2021-28877. + +* Mon May 24 2021 Josh Stone - 1.50.0-1 +- Update to 1.50.0. + +* Wed Jan 13 2021 Josh Stone - 1.49.0-1 +- Update to 1.49.0. + +* Tue Jan 12 2021 Josh Stone - 1.48.0-1 +- Update to 1.48.0. + +* Thu Oct 22 2020 Josh Stone - 1.47.0-1 +- Update to 1.47.0. + +* Wed Oct 14 2020 Josh Stone - 1.46.0-1 +- Update to 1.46.0. + +* Tue Aug 04 2020 Josh Stone - 1.45.2-1 +- Update to 1.45.2. + +* Thu Jul 16 2020 Josh Stone - 1.45.0-1 +- Update to 1.45.0. + +* Tue Jul 14 2020 Josh Stone - 1.44.1-1 +- Update to 1.44.1. + +* Thu May 07 2020 Josh Stone - 1.43.1-1 +- Update to 1.43.1. + +* Thu Apr 23 2020 Josh Stone - 1.43.0-1 +- Update to 1.43.0. + +* Thu Mar 12 2020 Josh Stone - 1.42.0-1 +- Update to 1.42.0. + +* Thu Feb 27 2020 Josh Stone - 1.41.1-1 +- Update to 1.41.1. + +* Thu Jan 30 2020 Josh Stone - 1.41.0-1 +- Update to 1.41.0. + +* Thu Jan 16 2020 Josh Stone - 1.40.0-1 +- Update to 1.40.0. +- Fix compiletest with newer (local-rebuild) libtest +- Build compiletest with in-tree libtest +- Fix ARM EHABI unwinding + +* Tue Nov 12 2019 Josh Stone - 1.39.0-2 +- Fix a couple build and test issues with rustdoc. + +* Thu Nov 07 2019 Josh Stone - 1.39.0-1 +- Update to 1.39.0. + +* Thu Sep 26 2019 Josh Stone - 1.38.0-1 +- Update to 1.38.0. + +* Thu Aug 15 2019 Josh Stone - 1.37.0-1 +- Update to 1.37.0. +- Disable libssh2 (git+ssh support). + +* Thu Jul 04 2019 Josh Stone - 1.36.0-1 +- Update to 1.36.0. + +* Wed May 29 2019 Josh Stone - 1.35.0-2 +- Fix compiletest for rebuild testing. + +* Thu May 23 2019 Josh Stone - 1.35.0-1 +- Update to 1.35.0. + +* Tue May 14 2019 Josh Stone - 1.34.2-1 +- Update to 1.34.2 -- fixes CVE-2019-12083. + +* Thu May 09 2019 Josh Stone - 1.34.1-1 +- Update to 1.34.1. + +* Thu Apr 11 2019 Josh Stone - 1.34.0-1 +- Update to 1.34.0. + +* Wed Apr 10 2019 Josh Stone - 1.33.0-1 +- Update to 1.33.0. + +* Tue Apr 09 2019 Josh Stone - 1.32.0-1 +- Update to 1.32.0. + +* Fri Dec 14 2018 Josh Stone - 1.31.0-5 +- Restore rust-lldb. + +* Thu Dec 13 2018 Josh Stone - 1.31.0-4 +- Backport fixes for rls. + +* Thu Dec 13 2018 Josh Stone - 1.31.0-3 +- Update to 1.31.0 -- Rust 2018! +- clippy/rls/rustfmt are no longer -preview + +* Wed Dec 12 2018 Josh Stone - 1.30.1-2 +- Update to 1.30.1. + +* Tue Nov 06 2018 Josh Stone - 1.29.2-1 +- Update to 1.29.2. + +* Thu Nov 01 2018 Josh Stone - 1.28.0-1 +- Update to 1.28.0. + +* Thu Nov 01 2018 Josh Stone - 1.27.2-1 +- Update to 1.27.2. + +* Wed Oct 10 2018 Josh Stone - 1.26.2-12 +- Fix "fp" target feature for AArch64 (#1632880) + +* Mon Oct 08 2018 Josh Stone - 1.26.2-11 +- Security fix for str::repeat (pending CVE). + +* Fri Oct 05 2018 Josh Stone - 1.26.2-10 +- Rebuild without bootstrap binaries. + +* Thu Oct 04 2018 Josh Stone - 1.26.2-9 +- Bootstrap without SCL packaging. (rhbz1635067) + +* Tue Aug 28 2018 Tom Stellard - 1.26.2-8 +- Use python3 prefix for lldb Requires + +* Mon Aug 13 2018 Josh Stone - 1.26.2-7 +- Build with platform-python + +* Tue Aug 07 2018 Josh Stone - 1.26.2-6 +- Exclude rust-src from auto-requires + +* Thu Aug 02 2018 Josh Stone - 1.26.2-5 +- Rebuild without bootstrap binaries. + +* Tue Jul 31 2018 Josh Stone - 1.26.2-4 +- Bootstrap as a module. + +* Mon Jun 04 2018 Josh Stone - 1.26.2-3 +- Update to 1.26.2. + +* Wed May 30 2018 Josh Stone - 1.26.1-2 +- Update to 1.26.1. + +* Fri May 18 2018 Josh Stone - 1.26.0-1 +- Update to 1.26.0. + +* Tue Apr 10 2018 Josh Stone - 1.25.0-2 +- Filter codegen-backends from Provides too. + +* Tue Apr 03 2018 Josh Stone - 1.25.0-1 +- Update to 1.25.0. +- Add rustfmt-preview as a subpackage. + +* Thu Feb 22 2018 Josh Stone - 1.24.0-1 +- Update to 1.24.0. + +* Tue Jan 16 2018 Josh Stone - 1.23.0-2 +- Rebuild without bootstrap binaries. + +* Mon Jan 15 2018 Josh Stone - 1.23.0-1 +- Bootstrap 1.23 on el8.