diff --git a/0001-bootstrap-allow-disabling-target-self-contained.patch b/0001-bootstrap-allow-disabling-target-self-contained.patch index 34d735d4073bd68a945a8afc7351ba8bae78eb0e..bd6d0ed33ba54e3c92693684642c9d488bfdb9f2 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 3a05424736e6b217e3a8439e233d193c0800ca92..3534abba8ab859fa19fe1ac3bc0e20f0038935c9 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,11 +38,31 @@ index 5149e3a12f23..cf62fbdc7f59 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 +--- 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); ++ key!(external_lib_path, optional); + 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 { + target_option_val!(linker_is_gnu_json, "linker-is-gnu"); + target_option_val!(pre_link_objects); + target_option_val!(post_link_objects); ++ target_option_val!(external_lib_path); + 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 321ab40403a3..54791c8892d8 100644 +index 02962d55a60e..169f5a74bbfd 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -2155,6 +2155,7 @@ pub struct TargetOptions { +@@ -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, @@ -49,7 +70,7 @@ index 321ab40403a3..54791c8892d8 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, -@@ -2651,6 +2652,7 @@ fn default() -> TargetOptions { +@@ -2712,6 +2713,7 @@ fn default() -> TargetOptions { relro_level: RelroLevel::None, pre_link_objects: Default::default(), post_link_objects: Default::default(), @@ -57,24 +78,8 @@ index 321ab40403a3..54791c8892d8 100644 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 { - 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); -+ key!(external_lib_path, optional); - 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 { - target_option_val!(linker_is_gnu_json, "linker-is-gnu"); - target_option_val!(pre_link_objects); - target_option_val!(post_link_objects); -+ target_option_val!(external_lib_path); - 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/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/101-Update-the-third-party-library-to-0.17.14.patch b/101-Update-the-third-party-library-to-0.17.14.patch deleted file mode 100644 index 94fbd7232cca710ed68179b474e149f60c4473d8..0000000000000000000000000000000000000000 --- a/101-Update-the-third-party-library-to-0.17.14.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 808a3a44694a742ee9dfadd497d16eed240873d4 Mon Sep 17 00:00:00 2001 -From: tomcruiseqi -Date: Fri, 1 Aug 2025 09:38:35 +0800 -Subject: [PATCH] Update the third party library to 0.17.14 - ---- - src/tools/clippy/lintcheck/ci_crates.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tools/clippy/lintcheck/ci_crates.toml b/src/tools/clippy/lintcheck/ci_crates.toml -index 629982345..64ed3def3 100644 ---- a/src/tools/clippy/lintcheck/ci_crates.toml -+++ b/src/tools/clippy/lintcheck/ci_crates.toml -@@ -94,7 +94,7 @@ tinyvec = { name = 'tinyvec', version = '1.8.0' } - futures-util = { name = 'futures-util', version = '0.3.31' } - futures-task = { name = 'futures-task', version = '0.3.31' } - sha2 = { name = 'sha2', version = '0.11.0-pre.3' } --ring = { name = 'ring', version = '0.17.8' } -+ring = { name = 'ring', version = '0.17.14' } - slab = { name = 'slab', version = '0.4.9' } - chrono = { name = 'chrono', version = '0.4.38' } - futures-sink = { name = 'futures-sink', version = '0.3.31' } --- -2.47.3 - diff --git a/download b/download deleted file mode 100644 index 9bcf6ea1b7bfd311f0799c5da4cd3d3432841f34..0000000000000000000000000000000000000000 --- a/download +++ /dev/null @@ -1,2 +0,0 @@ -11a9b245449ddafc08168e84c26c19f7 rustc-1.84.1-src.tar.xz -5ed1aa8f90f6861bee2e0f40c3d76138 wasi-libc-wasi-sdk-25.tar.gz diff --git a/macros.rust-srpm b/macros.rust-srpm index f3acc8c47264e84ab88ccc4b130be1c5e54b6be7..45287a8d5d218f51fc873c29d6d7f9052848898e 100644 --- a/macros.rust-srpm +++ b/macros.rust-srpm @@ -4,7 +4,7 @@ # this list will probably always be a superset of all architectures that are # supported by Fedora, which is why it is no longer required to set # "ExclusiveArch: rust_arches" for Rust packages in Fedora. -%rust_arches x86_64 %{ix86} armv7hl aarch64 ppc64 ppc64le riscv64 s390x loongarch64 +%rust_arches x86_64 %{ix86} armv7hl aarch64 ppc64 ppc64le riscv64 s390x # version_no_tilde: lua macro for reconstructing the original crate version # from the RPM version (i.e. replace any "~" characters with "-") diff --git a/rust.spec b/rust.spec index 4650068729c66b613a2a364ebb9dccfbc5f1b2f7..e9fe78944555679d3a78866952bfdc235cd59106 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ -%global anolis_release 4 +%global anolis_release 1 Name: rust -Version: 1.84.1 +Version: 1.85.0 Release: %{anolis_release}%{?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) @@ -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-11-06 # Only the specified arches will use bootstrap binaries. # NOTE: Those binaries used to be uploaded with every new release, but that was @@ -56,7 +56,7 @@ ExclusiveArch: %{rust_arches} # is insufficient. Rust currently requires LLVM 18.0+. # Enable compat llvm18 on Anolis OS 23.3 and later %global min_llvm_version 18.0.0 -%global bundled_llvm_version 19.1.5 +%global bundled_llvm_version 19.1.7 %global llvm_compat_version 18 %global llvm llvm%{?llvm_compat_version} %bcond_with bundled_llvm @@ -128,7 +128,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 @@ -140,9 +140,7 @@ Source102: cargo_vendor.attr Source103: 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 - -Patch101: 101-Update-the-third-party-library-to-0.17.14.patch +Patch100: rustc-1.85.0-disable-libssh2.patch # Get the Rust triple for any architecture and ABI. %{lua: function rust_triple(arch, abi) @@ -199,6 +197,9 @@ BuildRequires: (%{name} >= %{bootstrap_version} with %{name} <= %{version}) %global local_rust_root %{_prefix} %endif +# rust-1.85.spec +BuildRequires: rust >= 1.84, cargo >= 1.84 + BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ @@ -585,14 +586,13 @@ 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 %endif -%patch -P101 -p1 - # Use our explicit python3 first sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure @@ -724,11 +724,17 @@ end} %if %defined llvm_compat_version # clang_resource_dir is not defined for compat builds. %define profiler /usr/lib/clang/%{llvm_compat_version}/lib/%{_arch}-anolis-linux-gnu/libclang_rt.profile.a +%define profiler_dir /usr/lib/clang/%{llvm_compat_version}/lib/%{_arch}-anolis-linux-gnu %else %define profiler %{clang_resource_dir}/lib/%{_arch}-anolis-linux-gnu/libclang_rt.profile.a +%define profiler_dir %{clang_resource_dir}/lib/%{_arch}-anolis-linux-gnu %endif test -r "%{profiler}" +# Add profiler library directory to linker search path +export LIBRARY_PATH="%{profiler_dir}${LIBRARY_PATH:+:$LIBRARY_PATH}" +export LD_LIBRARY_PATH="%{profiler_dir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + %configure --disable-option-checking \ --docdir=%{_pkgdocdir} \ --libdir=%{common_libdir} \ @@ -1063,6 +1069,9 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %{_rpmconfigdir}/cargo_vendor.prov %changelog +* Thu Nov 6 2025 tomcruiseqi - 1.85.0-1 +- Update to 1.85.0 + * Fri Aug 1 2025 tomcruiseqi - 1.84.1-4 - Add patch to fix CVE-2025-4432 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 267bc3ca4f677e61e32f0ebe96a888857239ce47..09be94551e51eee0d6378ca9d4b45eaa300cf2ab 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.85.0-src.tar.xz b/rustc-1.85.0-src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..a4b046502449f83c3a7f4a3dc07ed7be92dbbfdb Binary files /dev/null and b/rustc-1.85.0-src.tar.xz differ 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 2e3ecc346471a91ccc5531038cabcffa1e2b5d42..08c395f2d593b56af8d031551dde600e59d33191 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/wasi-libc-wasi-sdk-25.tar.gz b/wasi-libc-wasi-sdk-25.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ed82c300d13dae61ac29e8f78958a520177391ce Binary files /dev/null and b/wasi-libc-wasi-sdk-25.tar.gz differ