From f0b7423eac233e6d84191daaaf36561e78bc948a Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Fri, 2 Oct 2026 20:12:42 +0200 Subject: [PATCH 1/4] rust-bootstrap: update to 1.99.0 --- srcpkgs/rust-bootstrap/template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template index e642eaf9655f6d..2bbe11861705ff 100644 --- a/srcpkgs/rust-bootstrap/template +++ b/srcpkgs/rust-bootstrap/template @@ -1,6 +1,6 @@ # Template file for 'rust-bootstrap' pkgname=rust-bootstrap -version=1.98.0 +version=1.99.0 revision=1 short_desc="Rust programming language bootstrap toolchain" maintainer="Orphaned " @@ -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=" - 5244bd76687b64cd7305ef038d8f349774eee494174899474535c23dcbeaa009 - 11c7a5cfa324e4324611793692a863490902bdff8b9ccd197404711cb8dc24d4" + 17d94ac00b3a5ae896022aabd9e73fb56f01881c9bd3d5095e08d9c9e608f4ac + b13902a225a6109588de09167831da111c70a30bedb2d9b9754d9fb13dc6e558" ;; 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=" - 0e37cb339f447fc44d6d781073bacacebfdc5612f2600e4c7e84c266f5f3aced - f5022e6c95a5ad23cca2513dc8281200f585fa188de6370aa37b128a43f876a3" + 77171ba2a0345fdf2abc4fedda55d6de078dae7a68527c28be8c77dcc9604bd5 + 3e58dff2d0b72196b5ea4e90536e174d400de88564a52694686b81e091169933" ;; 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=" - 4783d0963e5566b03e5e5be6bcb900672c177389d148d138fe1d75bc52554c91 - 1a76f782db2d540e1cd16ea47829b323f4a8f4dda64bca4b23be189109c510f8" + fa4fa63f0bf10fad6665f40004d8848b19cf15c98c72668e49afb05bb11bba5a + b106b0aa4565cc3525fd3161c69203a9e39044e6e6b4d618f261c3eeda14ad50" ;; aarch64) distfiles=" ${_bootstrap_url}/rustc-${version}-aarch64-unknown-linux-gnu.tar.xz ${_bootstrap_url}/rust-std-${version}-aarch64-unknown-linux-gnu.tar.xz" checksum=" - 00590657f2356d7163ca5ef295283523974c340fa21bb94b420ce794f29b358c - a36f7ac98af20ef0ba6368aace0345efabbebaef7962eba99f47190fd256162d" + 89c0f1a3a44df63c95e5d5f2ba093d0a12c5f5f57f8635f8a7a0ce50cf86600e + 1cf7e2ef58ed1cfa6f1adea18e155cbf254c1951f39e5f5e3376879f55fd64a4" ;; 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=" - 97ecfb023dd7dd5ce1cfa0d2d3c32b725f48bc1301c1be5b1dde80f6d8c5d00c - 36f82e96e86ec8a02d0a0a66574f4b7be086771cec41bb8e9d40ba5cbd64c93a" + 678c660838d055a7beca6af6b06ce79e7596e15fb73bd854f6bde8aa6800b09f + ea8fd309578a09c9e12401621a470e6d6b1047f25933207fb8a39d66647d4561" ;; # placeholders for user-supplied distfiles ppc64le) From f34e0a3d8ed22cfd05b06bbb08a7a8358d16b76e Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Fri, 2 Oct 2026 20:13:05 +0200 Subject: [PATCH 2/4] cargo-bootstrap: update to 1.99.0 --- srcpkgs/cargo-bootstrap/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template index b49c8f0d82c164..9c955402ab0cc5 100644 --- a/srcpkgs/cargo-bootstrap/template +++ b/srcpkgs/cargo-bootstrap/template @@ -1,6 +1,6 @@ # Template file for 'cargo-bootstrap' pkgname=cargo-bootstrap -version=1.98.0 +version=1.99.0 revision=1 short_desc="Bootstrap binaries of Rust package manager" maintainer="Orphaned " @@ -24,23 +24,23 @@ esac case "$XBPS_TARGET_MACHINE" in i686) distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz" - checksum="b768fe07ae4bd233e5c3f864f935620abb8b72139f7369c869e964a0c30ae419" + checksum="a6cdcfd06454695375a3aa89c37b0431b5146d55b1111fc323ac92a15d1d087a" ;; x86_64) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz" - checksum="2f512d170d3dd23e16ababcda32ee2e6d5172d861a7af1f504e0b1e270cafab9" + checksum="d7674918d28093097614cd9728b6ca60db9ea3038f640f0bd1e9a4188c7568ce" ;; x86_64-musl) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz" - checksum="8a4da98a9a099e2bf8c210a236cd0cc8d6a259254f4b8fdf6997177ea9e1e4bf" + checksum="0f60a28de17fc24ac3a12e23a298cc3f9caf82c2fdd44e47232db6e2fcb421eb" ;; aarch64) distfiles="${_bootstrap_url}/cargo-${version}-aarch64-unknown-linux-gnu.tar.xz" - checksum="5784379d73ac881d15a9e67eed2882cd58c747c276221c23cdf9aff37e015ff6" + checksum="113229fcc16cc1ba004923a4cc275fbf3281dafaaf8b97269f9c00189d497fd4" ;; aarch64-musl) distfiles="${_bootstrap_url}/cargo-${version}-aarch64-unknown-linux-musl.tar.xz" - checksum="0d4ad14495f631df4d680b1ee970b69ec10f7249d939e85aadc313e04450219f" + checksum="bef13b92330b96e493ad9e3d15d2bf1ceade4a62e2501a6c06e9614acc2d1463" ;; # placeholders for user-supplied distfiles ppc64le) From bbc764719746dc53df96745cc35a3140ebaaf4fc Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Fri, 2 Oct 2026 22:06:21 +0200 Subject: [PATCH 3/4] rust: update to 1.99.0 --- ...005-fix-rustdoc-when-cross-compiling.patch | 21 +++++++++---------- srcpkgs/rust/template | 10 ++++----- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/srcpkgs/rust/patches/0005-fix-rustdoc-when-cross-compiling.patch b/srcpkgs/rust/patches/0005-fix-rustdoc-when-cross-compiling.patch index 4a9cb1bc5412a1..55b8184ddd924b 100644 --- a/srcpkgs/rust/patches/0005-fix-rustdoc-when-cross-compiling.patch +++ b/srcpkgs/rust/patches/0005-fix-rustdoc-when-cross-compiling.patch @@ -4,20 +4,19 @@ Date: Mon, 9 Sep 2024 17:54:43 +0200 Subject: [PATCH 05/15] fix rustdoc when cross-compiling diff --git a/src/bootstrap/src/bin/rustdoc.rs b/src/bootstrap/src/bin/rustdoc.rs -index ef2462af95..75579842eb 100644 +index eba1e9ef1c..117f029e38 100644 --- a/src/bootstrap/src/bin/rustdoc.rs +++ b/src/bootstrap/src/bin/rustdoc.rs -@@ -7,8 +7,7 @@ use std::path::PathBuf; +@@ -6,7 +6,7 @@ use std::env; + use std::path::PathBuf; - use arg_file_command::ArgFileCommand; - use shared_helpers::{ -- dylib_path, dylib_path_var, maybe_dump, parse_rustc_stage, parse_rustc_verbose, -- parse_value_from_args, -+ dylib_path_var, maybe_dump, parse_rustc_stage, parse_rustc_verbose, parse_value_from_args, + use shim_utils::{ +- ArgFileCommand, collect_args, dylib_path, dylib_path_var, maybe_dump, parse_rustc_stage, ++ ArgFileCommand, collect_args, dylib_path_var, maybe_dump, parse_rustc_stage, + parse_rustc_verbose, parse_value_from_args, }; - #[path = "../utils/shared_helpers.rs"] -@@ -31,9 +30,6 @@ fn main() { +@@ -24,9 +24,6 @@ fn main() { // is passed (a bit janky...) let target = parse_value_from_args(&args, "--target"); @@ -27,7 +26,7 @@ index ef2462af95..75579842eb 100644 let mut cmd = ArgFileCommand::new(rustdoc); if target.is_some() { -@@ -52,7 +48,7 @@ fn main() { +@@ -45,7 +42,7 @@ fn main() { } cmd.args(&args); @@ -36,7 +35,7 @@ index ef2462af95..75579842eb 100644 // Force all crates compiled by this compiler to (a) be unstable and (b) // allow the `rustc_private` feature to link to other unstable crates -@@ -91,7 +87,7 @@ fn main() { +@@ -84,7 +81,7 @@ fn main() { eprintln!( "rustdoc command: {:?}={:?} {:?}", dylib_path_var(), diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 522fa8d547c4f6..a574ea92c07c5e 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -8,10 +8,10 @@ # uploaded to https://repo-default.voidlinux.org/distfiles/ # pkgname=rust -version=1.98.0 +version=1.99.0 revision=1 -_change_id=158169 -_llvmver=22 +_change_id=160100 +_llvmver=23 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap $(vopt_if wasi "clang${_llvmver} llvm${_llvmver} wasi-libc")" makedepends="libffi-devel ncurses-devel libxml2-devel libzstd-devel zlib-devel llvm${_llvmver}-devel" depends="rust-std gcc" @@ -20,7 +20,7 @@ maintainer="Enno Boland " license="Apache-2.0 OR MIT" homepage="https://www.rust-lang.org/" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=b226aef375ffbe9fbe2b85fde996b50716d59d55268e240d052396534b75e929 +checksum=2035e4077b834a42ff8afd07f277ae3f06340098b86b1d2843aa234b4cfcae67 lib32disabled=yes make_check=no # CBA for now python_version=3 # needed for python files in rust-src @@ -183,8 +183,8 @@ do_configure() { --set="rust.codegen-units=1" \ --set="rust.codegen-units-std=1" \ --set="rust.incremental=false" \ - --set="rust.jemalloc=false" \ --set="rust.llvm-tools=false" \ + --set="build.allocator=system" \ --set="build.submodules=false" \ --set="build.rustc=/usr/bin/rustc" \ --set="build.cargo=/usr/bin/cargo" \ From d41ae835378700614a16cb31a505b052f7e61ec5 Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Fri, 2 Oct 2026 22:26:00 +0200 Subject: [PATCH 4/4] cargo: update to 1.99.0 --- srcpkgs/cargo/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 0dcd2df2eeeaa8..127f655db92fa4 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.98.0 +version=1.99.0 revision=1 -_cargo_revision=0.99.0 +_cargo_revision=0.100.0 build_helper=rust hostmakedepends="cargo-bootstrap rust pkg-config" makedepends="rust libcurl-devel openssl-devel" @@ -12,7 +12,7 @@ maintainer="Enno Boland " 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=40e14b9e843aa85582450a9a97001db5f43ecf65622593d767b3943c4628a4b0 +checksum=336cb96ea30f717a46f435257fad331591724bbd2c5aca39433910ea1e4cc4a3 replaces="cargo-tree>=0" build_options="static bindist" @@ -65,12 +65,12 @@ do_install() { fi vbin ${cbin} - for f in src/etc/man/*.?; do + for f in etc/man/*.?; do vman $f done - vinstall src/etc/cargo.bashcomp.sh 0644 \ + vinstall etc/cargo.bashcomp.sh 0644 \ usr/share/bash-completion/completions cargo - vinstall src/etc/_cargo 0644 usr/share/zsh/site-functions + vinstall etc/_cargo 0644 usr/share/zsh/site-functions vlicense LICENSE-APACHE vlicense LICENSE-MIT