Rust 1.86

srcpkgs/cargo-bootstrap/template

@@ -1,6 +1,6 @@
 # Template file for 'cargo-bootstrap'
 pkgname=cargo-bootstrap
-version=1.85.1
+version=1.86.0
 revision=1
 short_desc="Bootstrap binaries of Rust package manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,15 +24,15 @@ esac
 case "$XBPS_TARGET_MACHINE" in
 	i686)
 		distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
-		checksum="5d409c7cb9e3eb240eb349ced1a88b49f4ccd289d80888d53e52cc94d446521f"
+		checksum="24f20bdc1bb14f4ffbdc2f540488bebc3340437418725c3162215ae03cdad480"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="7373132c13e394755d15f01bda4374af59b4daef01b12a83cb3df3f3be38e289"
+		checksum="c5c1590f7e9246ad9f4f97cfe26ffa92707b52a769726596a9ef81565ebd908b"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="f0056f62d54ffcc039a6a68985947d56280fdbb0109f9faeaabcd53ef0f46e62"
+		checksum="f7691025ee1a06cc400fa959ea9601ebd41a87d4695615ab8eba31353171b304"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

srcpkgs/cargo/template

@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.85.0
+version=1.86.0
 revision=1
-_cargo_revision=0.86.0
+_cargo_revision=0.87.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
 makedepends="rust libcurl-devel openssl-devel"
@@ -12,7 +12,7 @@ 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=2a63784f9ea81e291b8305dbc84607c5513b9c597ed7e8276973a748036db303
+checksum=e37e329434ba84e55b87468372dd597de5e275f6b40acf24574e606c2ac5851b
 replaces="cargo-tree>=0"
 
 build_options="static bindist"
@@ -23,7 +23,7 @@ if [ -n "$build_option_static" -o -n "$build_option_bindist" ]; then
 fi
 
 if [ -z "$_build_static" ]; then
-	makedepends+=" libgit2-1.8-devel"
+	makedepends+=" libgit2-1.9-devel"
 fi
 
 do_build() {

srcpkgs/rust-bootstrap/template

@@ -1,6 +1,6 @@
 # Template file for 'rust-bootstrap'
 pkgname=rust-bootstrap
-version=1.85.1
+version=1.86.0
 revision=1
 short_desc="Rust programming language bootstrap toolchain"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -31,24 +31,24 @@ 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="
-		 9a437177aeda9a50446ff0608db1bce3d269ef2a4c2237e1727a7f85af2e4cf5
-		 385f2b7c629fc23d85ef02f95d1d126bca33c27abeb405641baa7a9fd3af9000"
+		 976f4604d949d722738a9fe95313035226571128396e942b0fc678180be487b0
+		 ce9f0fa4b0760730e26bf315cebe099f0b883436e095c5fc4b94ba20bd9f121a"
 		;;
 	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="
-		 92a5c532b9e87912190128704e0d65825912e3b08a6ee9203c4068d6d1df62c4
-		 0aaeffba85359503f874315cd08e0ae8490275d14b41470d36d4fa57fd085916"
+		 4438b809ce4a083af31ed17aeeedcc8fc60ccffc0625bef1926620751b6989d7
+		 67be7184ea388d8ce0feaf7fdea46f1775cfc2970930264343b3089898501d37"
 		;;
 	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="
-		 327d74ef87a7e57b5486b123b89e6c9112926b2edab5203d3168983e96a2eb6b
-		 a2a99b60e86214a836e53396f3a0716a48724902b9dd8c69f146897efc76691e"
+		 e1c7258b97f0e14ccd8f30ce7d48ca6de08ddcd44bc867e6782c239796fa0f6e
+		 8313c108da105181d27a5a0190ab46d1ac5b3e32bb5b2e7e0a41b7b5d353cba6"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

srcpkgs/rust/patches/0001-Fix-LLVM-build.patch

@@ -4,16 +4,16 @@ Date: Fri, 8 Sep 2017 00:04:29 -0500
 Subject: [PATCH 01/15] Fix LLVM build
 
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index 33b8f1a7c..f4942dd2d 100644
+index 21b02a3b5..01b99f3e2 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1195,7 +1195,8 @@ impl Build {
-             .args()
+@@ -1209,7 +1209,8 @@ Executed at: {executed_at}"#,
+         base.args()
              .iter()
              .map(|s| s.to_string_lossy().into_owned())
 -            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
 +            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O")
 +                    && !s.starts_with("-static"))
-             .collect::<Vec<String>>();
+             .collect::<Vec<String>>()
+     }
 
-         // If we're compiling C++ on macOS then we add a flag indicating that

srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch

@@ -97,10 +97,10 @@ index 22e49f2f1..28a954758 100644
          },
      }
 diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs
-index 6ba87c732..b805b80b8 100644
+index 3d25c951e..f509c9825 100644
 --- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs
-@@ -6,8 +6,6 @@ pub(crate) fn target() -> Target {
+@@ -9,8 +9,6 @@ pub(crate) fn target() -> Target {
      base.max_atomic_width = Some(64);
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32", "-Wl,-melf_i386"]);
      base.stack_probes = StackProbeType::Inline;
@@ -123,10 +123,10 @@ index 8dcdc5be8..8be0f335d 100644
      Target {
          llvm_target: "x86_64-unknown-linux-musl".into(),
 diff --git a/config.example.toml b/config.example.toml
-index 5ea6774ce..ed0da89d7 100644
+index f5395375a..3aa6e21ac 100644
 --- a/config.example.toml
 +++ b/config.example.toml
-@@ -629,14 +629,6 @@
+@@ -625,14 +625,6 @@
  # behavior -- this may lead to miscompilations or other bugs.
  #description = ""
 
@@ -142,10 +142,10 @@ index 5ea6774ce..ed0da89d7 100644
  # platforms to ensure that the compiler is usable by default from the build
  # directory (as it links to a number of dynamic libraries). This may not be
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index a86c20d46..9358154de 100755
+index ac971a64d..f7367c8da 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -175,76 +175,6 @@ v("llvm-config", None, "set path to llvm-config")
+@@ -179,76 +179,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")
@@ -223,10 +223,10 @@ index a86c20d46..9358154de 100755
      "musl-root-powerpc64le",
      "target.powerpc64le-unknown-linux-musl.musl-root",
 diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index eeb5b18fd..4ee47e7c4 100644
+index 479327d63..115b3eb0a 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -331,39 +331,7 @@ fn copy_self_contained_objects(
+@@ -333,39 +333,7 @@ fn copy_self_contained_objects(
      let mut target_deps = vec![];
 
      // Copies the libc and CRT objects.
@@ -236,7 +236,7 @@ index eeb5b18fd..4ee47e7c4 100644
 -    // to using gcc from a glibc-targeting toolchain for linking.
 -    // To do that we have to distribute musl startup objects as a part of Rust toolchain
 -    // and link with them manually in the self-contained mode.
--    if target.contains("musl") && !target.contains("unikraft") {
+-    if target.needs_crt_begin_end() {
 -        let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
 -            panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
 -        });
@@ -267,7 +267,7 @@ index eeb5b18fd..4ee47e7c4 100644
          let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| {
              panic!(
                  "Target {:?} does not have a \"wasi-root\" key in Config.toml \
-@@ -530,15 +498,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -573,15 +541,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
              .arg("--manifest-path")
              .arg(builder.src.join("library/sysroot/Cargo.toml"));
 
@@ -284,18 +284,18 @@ index eeb5b18fd..4ee47e7c4 100644
              if let Some(dir) = builder.wasi_libdir(target) {
                  let root = format!("native={}", dir.to_str().unwrap());
 diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 0587408e9..ad3b1c374 100644
+index 65f286a05..f12d57b14 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -346,7 +346,6 @@ pub struct Config {
+@@ -350,7 +350,6 @@ pub struct Config {
      pub print_step_rusage: bool,
 
      // Fallback musl-root for all targets
 -    pub musl_root: Option<PathBuf>,
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -627,8 +626,6 @@ pub struct Target {
+@@ -635,8 +634,6 @@ pub struct Target {
      pub profiler: Option<StringOrBool>,
      pub rpath: Option<bool>,
      pub crt_static: Option<bool>,
@@ -304,15 +304,15 @@ index 0587408e9..ad3b1c374 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub runner: Option<String>,
-@@ -1157,7 +1154,6 @@ define_config! {
+@@ -1171,7 +1168,6 @@ define_config! {
          default_linker: Option<String> = "default-linker",
          channel: Option<String> = "channel",
          description: Option<String> = "description",
 -        musl_root: Option<String> = "musl-root",
          rpath: Option<bool> = "rpath",
          strip: Option<bool> = "strip",
          frame_pointers: Option<bool> = "frame-pointers",
-@@ -1212,8 +1208,6 @@ define_config! {
+@@ -1226,8 +1222,6 @@ define_config! {
          profiler: Option<StringOrBool> = "profiler",
          rpath: Option<bool> = "rpath",
          crt_static: Option<bool> = "crt-static",
@@ -321,23 +321,23 @@ index 0587408e9..ad3b1c374 100644
          wasi_root: Option<String> = "wasi-root",
          qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-@@ -1758,7 +1752,6 @@ impl Config {
+@@ -1821,7 +1815,6 @@ impl Config {
                  default_linker,
                  channel: _, // already handled above
                  description,
 -                musl_root,
                  rpath,
                  verbose_tests,
                  optimize_tests,
-@@ -1866,7 +1859,6 @@ impl Config {
+@@ -1929,7 +1922,6 @@ impl Config {
              config.llvm_enzyme =
                  llvm_enzyme.unwrap_or(config.channel == "dev" || config.channel == "nightly");
              config.rustc_default_linker = default_linker;
 -            config.musl_root = musl_root.map(PathBuf::from);
              config.save_toolstates = save_toolstates.map(PathBuf::from);
-             set(&mut config.deny_warnings, match flags.warnings {
-                 Warnings::Deny => Some(true),
-@@ -2088,8 +2080,6 @@ impl Config {
+             set(
+                 &mut config.deny_warnings,
+@@ -2152,8 +2144,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.map(PathBuf::from);
                  target.linker = cfg.linker.map(PathBuf::from);
                  target.crt_static = cfg.crt_static;
@@ -346,7 +346,7 @@ index 0587408e9..ad3b1c374 100644
                  target.wasi_root = cfg.wasi_root.map(PathBuf::from);
                  target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
                  target.runner = cfg.runner;
-@@ -3212,7 +3202,6 @@ fn check_incompatible_options_for_ci_rustc(
+@@ -3295,7 +3285,6 @@ fn check_incompatible_options_for_ci_rustc(
          debuginfo_level_tools: _,
          debuginfo_level_tests: _,
          backtrace: _,
@@ -355,7 +355,7 @@ index 0587408e9..ad3b1c374 100644
          optimize_tests: _,
          codegen_tests: _,
 diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
-index ed0155622..9873a6c09 100644
+index 9e4a0816e..36c3b5901 100644
 --- a/src/bootstrap/src/core/sanity.rs
 +++ b/src/bootstrap/src/core/sanity.rs
 @@ -11,7 +11,7 @@
@@ -367,15 +367,15 @@ index ed0155622..9873a6c09 100644
 
  use crate::Build;
  #[cfg(not(test))]
-@@ -321,28 +321,6 @@ than building it.
+@@ -325,28 +325,6 @@ than building it.
              continue;
          }
 
 -        // Make sure musl-root is valid.
 -        if target.contains("musl") && !target.contains("unikraft") {
 -            // If this is a native target (host is also musl) and no musl-root is given,
 -            // fall back to the system toolchain in /usr before giving up
--            if build.musl_root(*target).is_none() && build.config.build == *target {
+-            if build.musl_root(*target).is_none() && build.is_builder_target(target) {
 -                let target = build.config.target_config.entry(*target).or_default();
 -                target.musl_root = Some("/usr".into());
 -            }
@@ -397,10 +397,10 @@ index ed0155622..9873a6c09 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 ccc115a27..7cc8cc0c5 100644
+index 21b02a3b5..491d924d4 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1283,25 +1283,6 @@ Executed at: {executed_at}"#,
+@@ -1322,25 +1322,6 @@ Executed at: {executed_at}"#,
          }
      }
 
@@ -427,10 +427,10 @@ index ccc115a27..7cc8cc0c5 100644
      /// configured.
      ///
 diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
-index 4aec554b4..211efb6e3 100644
+index 45797c127..12393b659 100644
 --- a/src/bootstrap/src/utils/cc_detect.rs
 +++ b/src/bootstrap/src/utils/cc_detect.rs
-@@ -220,30 +220,6 @@ fn default_compiler(
+@@ -210,30 +210,6 @@ fn default_compiler(
              }
          }
 

srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch

@@ -9,19 +9,19 @@ binaries), rustc never requests specific ABI from llvm in the first place,
 so at least match the environment we have.
 
 diff --git a/compiler/rustc_target/src/callconv/powerpc64.rs b/compiler/rustc_target/src/callconv/powerpc64.rs
-index 3a71592cb..24beb8254 100644
+index 89ec85e4b..003be5d6f 100644
 --- a/compiler/rustc_target/src/callconv/powerpc64.rs
 +++ b/compiler/rustc_target/src/callconv/powerpc64.rs
-@@ -3,7 +3,7 @@
+@@ -2,7 +2,7 @@
+ // Alignment of 128 bit types is not currently handled, this will
  // need to be fixed when PowerPC vector support is added.
 
- use crate::abi::call::{Align, ArgAbi, FnAbi, Reg, RegKind, Uniform};
--use crate::abi::{Endian, HasDataLayout, TyAbiInterface};
-+use crate::abi::{HasDataLayout, TyAbiInterface};
- use crate::spec::HasTargetSpec;
+-use rustc_abi::{Endian, HasDataLayout, TyAbiInterface};
++use rustc_abi::{HasDataLayout, TyAbiInterface};
 
- #[derive(Debug, Clone, Copy, PartialEq)]
-@@ -99,16 +99,7 @@ where
+ use crate::callconv::{Align, ArgAbi, FnAbi, Reg, RegKind, Uniform};
+ use crate::spec::HasTargetSpec;
+@@ -102,16 +102,7 @@ where
      Ty: TyAbiInterface<'a, C> + Copy,
      C: HasDataLayout + HasTargetSpec,
  {

srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch

@@ -4,25 +4,18 @@ Date: Fri, 16 Apr 2021 03:34:16 -0300
 Subject: [PATCH 14/15] copy new version of need-ssp_nonshared.patch from
  alpine
 
----
- library/std/src/sys/pal/unix/mod.rs | 4 ++++
- 1 file changed, 4 insertions(+)
-
 diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs
-index 43cb9d89b..4158c79da 100644
+index c0b56d8d2..b92ecb5e0 100644
 --- a/library/std/src/sys/pal/unix/mod.rs
 +++ b/library/std/src/sys/pal/unix/mod.rs
-@@ -379,6 +379,10 @@ cfg_if::cfg_if! {
+@@ -374,6 +374,10 @@ cfg_if::cfg_if! {
          #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
          #[link(name = "log", cfg(not(target_feature = "crt-static")))]
-         extern "C" {}
+         unsafe extern "C" {}
 +    } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
 +        #[link(name = "ssp_nonshared")]
 +        #[link(name = "execinfo")]
-+        extern "C" {}
++        unsafe extern "C" {}
      } else if #[cfg(target_os = "freebsd")] {
          #[link(name = "execinfo")]
          #[link(name = "pthread")]
--- 
-2.44.0
-