Rust 1.98

srcpkgs/cargo-bootstrap/template

@@ -1,6 +1,6 @@
 # Template file for 'cargo-bootstrap'
 pkgname=cargo-bootstrap
-version=1.97.1
+version=1.98.0
 revision=1
 short_desc="Bootstrap binaries of Rust package manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,23 +24,23 @@ esac
 case "$XBPS_TARGET_MACHINE" in
 	i686)
 		distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
-		checksum="b76d87a7a550c51c48d4e9396cec29917b2e8fcac7b7ffeb6da01b22e2b723dc"
+		checksum="b768fe07ae4bd233e5c3f864f935620abb8b72139f7369c869e964a0c30ae419"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="e1be5f5ff7f7f80ca506fb65770b759edbdc6d303781ed71c5de8ec8a8394779"
+		checksum="2f512d170d3dd23e16ababcda32ee2e6d5172d861a7af1f504e0b1e270cafab9"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="623a1315bdbddc5e7a807aaf7e1911d1435a294758e170b8758f49fc57a3e67c"
+		checksum="8a4da98a9a099e2bf8c210a236cd0cc8d6a259254f4b8fdf6997177ea9e1e4bf"
 		;;
 	aarch64)
 		distfiles="${_bootstrap_url}/cargo-${version}-aarch64-unknown-linux-gnu.tar.xz"
-		checksum="8f70bcaccea5ba4db187c3fd4d64e24592b4e16af513497201f5909d61691dbe"
+		checksum="5784379d73ac881d15a9e67eed2882cd58c747c276221c23cdf9aff37e015ff6"
 		;;
 	aarch64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-aarch64-unknown-linux-musl.tar.xz"
-		checksum="7a0f929c8cfb1fa6b594915a4dc7c0b9f41fd3dfe2deadef76ba5eb50589dc9e"
+		checksum="0d4ad14495f631df4d680b1ee970b69ec10f7249d939e85aadc313e04450219f"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

srcpkgs/cargo/template

@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.97.0
+version=1.98.0
 revision=1
-_cargo_revision=0.98.0
+_cargo_revision=0.99.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust pkg-config"
 makedepends="rust libcurl-devel openssl-devel"
@@ -12,8 +12,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0 OR MIT"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
-checksum=7c11186fb61d20a8237b777b35beedd224c1103934f35b85fdd64ea2a9c77f07
+checksum=40e14b9e843aa85582450a9a97001db5f43ecf65622593d767b3943c4628a4b0
 replaces="cargo-tree>=0"
+nocross="save the builders"
 
 build_options="static bindist"
 desc_option_bindist="Generate a tarball for bootstrap"

srcpkgs/rust-bootstrap/template

@@ -1,6 +1,6 @@
 # Template file for 'rust-bootstrap'
 pkgname=rust-bootstrap
-version=1.97.1
+version=1.98.0
 revision=1
 short_desc="Rust programming language bootstrap toolchain"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -31,40 +31,40 @@ case "$XBPS_TARGET_MACHINE" in
 		 ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
 		checksum="
-		 c096e21362fe1390e7aefc731671bce208a43828a83bcc32a35ffb8302f5802e
-		 7f4be0697e96dd81f75f66f0e25a51d595223e7c58af6675810f066cab6ef584"
+		 5244bd76687b64cd7305ef038d8f349774eee494174899474535c23dcbeaa009
+		 11c7a5cfa324e4324611793692a863490902bdff8b9ccd197404711cb8dc24d4"
 		;;
 	x86_64)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
 		checksum="
-		 9819d0a32d56bd339585319c80260e332779f5541fd66838ab7e016d6c814819
-		 1c1e704ae80126b7de34f72ea2825f7fd01736dec20732faed47374b95282fba"
+		 0e37cb339f447fc44d6d781073bacacebfdc5612f2600e4c7e84c266f5f3aced
+		 f5022e6c95a5ad23cca2513dc8281200f585fa188de6370aa37b128a43f876a3"
 		;;
 	x86_64-musl)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
 		checksum="
-		 1b1f926d3b5bf8036c858180dbc9518c6c317154718ee5c5460bb23d23bacf5d
-		 51d83178680556f73a5fa8ad865b76a1ff541867445c00fc65dc67246bc2de66"
+		 4783d0963e5566b03e5e5be6bcb900672c177389d148d138fe1d75bc52554c91
+		 1a76f782db2d540e1cd16ea47829b323f4a8f4dda64bca4b23be189109c510f8"
 		;;
 	aarch64)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-aarch64-unknown-linux-gnu.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-aarch64-unknown-linux-gnu.tar.xz"
 		checksum="
-		 b344b81f0cd4c2246c7da8b197fe7a339d7dd02bb15cb69b2524115d9c75224c
-		 46aed8e63186350004d8ec6afca798811e6530b514352e5a8a26f3dc4939b3be"
+		 00590657f2356d7163ca5ef295283523974c340fa21bb94b420ce794f29b358c
+		 a36f7ac98af20ef0ba6368aace0345efabbebaef7962eba99f47190fd256162d"
 		;;
 	aarch64-musl)
 		distfiles="
 		 ${_bootstrap_url}/rustc-${version}-aarch64-unknown-linux-musl.tar.xz
 		 ${_bootstrap_url}/rust-std-${version}-aarch64-unknown-linux-musl.tar.xz"
 		checksum="
-		 d6b7d9babbad6ad2bd68e98e41a06efd3df7b405f85f173f689bcace3cd9197f
-		 49ff0879d94e2e8e86d5e85eb15a9215943e8c78b51363d6553443598cab5d31"
+		 97ecfb023dd7dd5ce1cfa0d2d3c32b725f48bc1301c1be5b1dde80f6d8c5d00c
+		 36f82e96e86ec8a02d0a0a66574f4b7be086771cec41bb8e9d40ba5cbd64c93a"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

srcpkgs/rust/patches/0002-remove-a-bunch-of-unused-junk.patch

@@ -4,7 +4,7 @@ Date: Fri, 30 May 2025 12:33:02 +0200
 Subject: [PATCH 02/15] remove a bunch of unused junk
 
 diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
-index 6d3124b55..056eeaa81 100644
+index 6d3124b559..056eeaa810 100644
 --- a/compiler/rustc_target/src/spec/base/linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
 @@ -1,11 +1,8 @@
@@ -21,7 +21,7 @@ index 6d3124b55..056eeaa81 100644
      }
  }
 diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
-index 2d84e78f2..607a777eb 100644
+index 2d84e78f25..607a777eb3 100644
 --- a/compiler/rustc_target/src/spec/crt_objects.rs
 +++ b/compiler/rustc_target/src/spec/crt_objects.rs
 @@ -48,7 +48,10 @@ use crate::spec::LinkOutputKind;
@@ -66,10 +66,10 @@ index 2d84e78f2..607a777eb 100644
      new(&[
          (LinkOutputKind::DynamicNoPicExe, &["crt2.o"]),
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 1915986be..7f5721594 100755
+index fda8f004ef..3e7e828a0c 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -180,106 +180,6 @@ v("llvm-config", None, "set path to llvm-config")
+@@ -185,106 +185,6 @@ v("llvm-config", None, "set path to llvm-config")
  v("llvm-filecheck", None, "set path to LLVM's FileCheck utility")
  v("python", "build.python", "set path to python")
  v("android-ndk", "build.android-ndk", "set path to Android NDK")
@@ -177,10 +177,10 @@ index 1915986be..7f5721594 100755
      "qemu-armhf-rootfs",
      "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
 diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 02940a802..d105f128b 100644
+index ffbe4f4e74..d03c10d990 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -375,54 +375,7 @@ fn copy_self_contained_objects(
+@@ -382,54 +382,7 @@ fn copy_self_contained_objects(
      t!(fs::create_dir_all(&libdir_self_contained));
      let mut target_deps = vec![];
 
@@ -236,7 +236,7 @@ index 02940a802..d105f128b 100644
          let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| {
              panic!(
                  "Target {:?} does not have a \"wasi-root\" key in bootstrap.toml \
-@@ -656,15 +609,6 @@ pub fn std_cargo(
+@@ -670,15 +623,6 @@ pub fn std_cargo(
              .arg("--manifest-path")
              .arg(builder.src.join("library/sysroot/Cargo.toml"));
 
@@ -253,10 +253,10 @@ index 02940a802..d105f128b 100644
              && let Some(dir) = builder.wasi_libdir(target)
          {
 diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
-index db2a76c4a..d08d8d8d0 100644
+index 087a395a06..0d9eb58a8e 100644
 --- a/src/bootstrap/src/core/build_steps/llvm.rs
 +++ b/src/bootstrap/src/core/build_steps/llvm.rs
-@@ -1320,10 +1320,7 @@ impl Step for CrtBeginEnd {
+@@ -1600,10 +1600,7 @@ impl Step for CrtBeginEnd {
          run.path("src/llvm-project/compiler-rt/lib/crt")
      }
 
@@ -269,10 +269,10 @@ index db2a76c4a..d08d8d8d0 100644
 
      /// Build crtbegin.o/crtend.o for musl target.
 diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 2f493658e..0236d8170 100644
+index 267e21c599..6184818d7d 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -262,8 +262,6 @@ pub struct Config {
+@@ -269,8 +269,6 @@ pub struct Config {
      pub print_step_timings: bool,
      pub print_step_rusage: bool,
 
@@ -281,15 +281,15 @@ index 2f493658e..0236d8170 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -539,7 +537,6 @@ impl Config {
+@@ -557,7 +555,6 @@ impl Config {
              randomize_layout: rust_randomize_layout,
              default_linker: rust_default_linker,
              channel: rust_channel,
 -            musl_root: rust_musl_root,
              rpath: rust_rpath,
              verbose_tests: rust_verbose_tests,
              optimize_tests: rust_optimize_tests,
-@@ -868,8 +865,6 @@ impl Config {
+@@ -897,8 +894,6 @@ impl Config {
                      rpath: target_rpath,
                      rustflags: target_rustflags,
                      crt_static: target_crt_static,
@@ -298,7 +298,7 @@ index 2f493658e..0236d8170 100644
                      wasi_root: target_wasi_root,
                      qemu_rootfs: target_qemu_rootfs,
                      no_std: target_no_std,
-@@ -942,8 +937,6 @@ impl Config {
+@@ -971,8 +966,6 @@ impl Config {
                  target.crt_static = target_crt_static;
                  target.default_linker = target_default_linker;
                  target.default_linker_linux_override = default_linker_linux_override;
@@ -307,7 +307,7 @@ index 2f493658e..0236d8170 100644
                  target.wasi_root = target_wasi_root.map(PathBuf::from);
                  target.qemu_rootfs = target_qemu_rootfs.map(PathBuf::from);
                  target.runner = target_runner;
-@@ -1393,7 +1386,6 @@ impl Config {
+@@ -1446,7 +1439,6 @@ NOTE: Please add `--stage 2` to your command line, or if you're sure you want to
              low_priority: build_low_priority.unwrap_or(false),
              mandir: install_mandir.map(PathBuf::from),
              miri_info,
@@ -316,10 +316,10 @@ index 2f493658e..0236d8170 100644
              nodejs: build_nodejs.map(PathBuf::from),
              omit_git_hash,
 diff --git a/src/bootstrap/src/core/config/target_selection.rs b/src/bootstrap/src/core/config/target_selection.rs
-index 47f6d6f38..a519b6655 100644
+index 62abd30387..ca311f58bc 100644
 --- a/src/bootstrap/src/core/config/target_selection.rs
 +++ b/src/bootstrap/src/core/config/target_selection.rs
-@@ -96,10 +96,6 @@ impl TargetSelection {
+@@ -104,10 +104,6 @@ impl TargetSelection {
          env::var("OSTYPE").is_ok_and(|v| v.to_lowercase().contains("cygwin"))
      }
 
@@ -331,18 +331,18 @@ index 47f6d6f38..a519b6655 100644
      pub fn filepath(&self) -> Option<&Path> {
          self.file.as_ref().map(Path::new)
 diff --git a/src/bootstrap/src/core/config/toml/rust.rs b/src/bootstrap/src/core/config/toml/rust.rs
-index 48042ba56..083970f1b 100644
+index 2facf83952..3aedf0d0db 100644
 --- a/src/bootstrap/src/core/config/toml/rust.rs
 +++ b/src/bootstrap/src/core/config/toml/rust.rs
-@@ -31,7 +31,6 @@ define_config! {
+@@ -33,7 +33,6 @@ define_config! {
          incremental: Option<bool> = "incremental",
          default_linker: Option<String> = "default-linker",
          channel: Option<String> = "channel",
 -        musl_root: Option<String> = "musl-root",
          rpath: Option<bool> = "rpath",
          rustflags: Option<Vec<String>> = "rustflags",
          strip: Option<bool> = "strip",
-@@ -346,7 +345,6 @@ pub fn check_incompatible_options_for_ci_rustc(
+@@ -349,7 +348,6 @@ pub fn check_incompatible_options_for_ci_rustc(
          debuginfo_level_tools: _,
          debuginfo_level_tests: _,
          backtrace: _,
@@ -351,10 +351,10 @@ index 48042ba56..083970f1b 100644
          optimize_tests: _,
          codegen_tests: _,
 diff --git a/src/bootstrap/src/core/config/toml/target.rs b/src/bootstrap/src/core/config/toml/target.rs
-index 847b75e69..5ad42917a 100644
+index 311d9add9a..23e2ebc707 100644
 --- a/src/bootstrap/src/core/config/toml/target.rs
 +++ b/src/bootstrap/src/core/config/toml/target.rs
-@@ -39,8 +39,6 @@ define_config! {
+@@ -40,8 +40,6 @@ define_config! {
          rpath: Option<bool> = "rpath",
          rustflags: Option<Vec<String>> = "rustflags",
          crt_static: Option<bool> = "crt-static",
@@ -363,7 +363,7 @@ index 847b75e69..5ad42917a 100644
          wasi_root: Option<String> = "wasi-root",
          qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-@@ -73,8 +71,6 @@ pub struct Target {
+@@ -75,8 +73,6 @@ pub struct Target {
      pub rpath: Option<bool>,
      pub rustflags: Vec<String>,
      pub crt_static: Option<bool>,
@@ -373,19 +373,10 @@ index 847b75e69..5ad42917a 100644
      pub qemu_rootfs: Option<PathBuf>,
      pub runner: Option<String>,
 diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
-index 50d815401..3818e081b 100644
+index 99d9c8a04c..8fce44814f 100644
 --- a/src/bootstrap/src/core/sanity.rs
 +++ b/src/bootstrap/src/core/sanity.rs
-@@ -12,7 +12,7 @@
- use std::collections::{HashMap, HashSet};
- use std::ffi::{OsStr, OsString};
- use std::path::PathBuf;
--use std::{env, fs};
-+use std::env;
-
- #[cfg(not(test))]
- use crate::builder::Builder;
-@@ -367,22 +367,6 @@ than building it.
+@@ -366,22 +366,6 @@ than building it.
              continue;
          }
 
@@ -409,10 +400,10 @@ index 50d815401..3818e081b 100644
              // There are three builds of cmake on windows: MSVC, MinGW, and
              // Cygwin. The Cygwin build does not have generators for Visual
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index a31eb0c1c..a78506c39 100644
+index 2231e0886b..8969e7efcc 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1394,35 +1394,6 @@ impl Build {
+@@ -1407,35 +1407,6 @@ impl Build {
          }
      }
 
@@ -449,10 +440,10 @@ index a31eb0c1c..a78506c39 100644
      /// configured.
      ///
 diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
-index 0662ae304..f6373f44e 100644
+index 320dfcc4e6..139480bb3a 100644
 --- a/src/bootstrap/src/utils/cc_detect.rs
 +++ b/src/bootstrap/src/utils/cc_detect.rs
-@@ -195,30 +195,6 @@ fn default_compiler(
+@@ -201,30 +201,6 @@ fn default_compiler(
              }
          }