Skip to content

Rust 1.93 #58653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tranzystorekk merged 4 commits into from
Jan 24, 2026
+49 −67
Merged

Rust 1.93 #58653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d664729
rust-bootstrap: update to 1.93.0
tranzystorekk Jan 22, 2026
46f31a7
cargo-bootstrap: update to 1.93.0
tranzystorekk Jan 22, 2026
4c4467c
rust: update to 1.93.0
tranzystorekk Jan 22, 2026
e9e0ad8
cargo: update to 1.93.0
tranzystorekk Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions srcpkgs/cargo-bootstrap/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'cargo-bootstrap'
pkgname=cargo-bootstrap
version=1.92.0
version=1.93.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="Orphaned <orphan@voidlinux.org>"
Expand All @@ -24,15 +24,15 @@ esac
case "$XBPS_TARGET_MACHINE" in
i686)
distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="63001bbde1c036fae9ad624807bfb18117c7e7cb4a04de81adc4acc7e8580c07"
checksum="2c6fb5893b4abcdf6af9dc3c4f60abc072318b0cb13f2bd969585910b7ba048b"
;;
x86_64)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="e5e12be2c7126a7036c8adf573078a28b92611f5767cc9bd0a6f7c83081df103"
checksum="c23de3ae709ff33eed5e4ae59d1f9bcd75fa4dbaa9fb92f7b06bfb534b8db880"
;;
x86_64-musl)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="b37ef0ce8c49103a904559f17c83c6e5a182f0f165f158e7be00e9036ca8c6d5"
checksum="1eee0f6752a31430dc7cf16718de55ef7ad45882cc4c05fa97f1ef280af61135"
;;
# placeholders for user-supplied distfiles
ppc64le)
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/cargo/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Template file for 'cargo'
pkgname=cargo
version=1.92.0
version=1.93.0
revision=1
_cargo_revision=0.93.0
_cargo_revision=0.94.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust pkg-config"
makedepends="rust libcurl-devel openssl-devel"
Expand All @@ -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=03a675ae1d0e34599f1fdd500a9b76d780314c1546ffe8230e36775fc4a29d71
checksum=d60d883fed2916d8d0dd723fb98bdc81410c17660b9a020470b5af91f87026fa
replaces="cargo-tree>=0"

build_options="static bindist"
Expand Down
14 changes: 7 additions & 7 deletions srcpkgs/rust-bootstrap/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'rust-bootstrap'
pkgname=rust-bootstrap
version=1.92.0
version=1.93.0
revision=1
short_desc="Rust programming language bootstrap toolchain"
maintainer="Orphaned <orphan@voidlinux.org>"
Expand Down Expand Up @@ -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="
c1c920cd59e255e5dcf844af22b80483fe4b04ff04f143be6da69314bd6733f8
abc840631a4462a4c8ec61341110ff653ab2ef86ef3b10f84489d00cc8a9310d"
72038681a14fe632e2b550392b83dadf40325c472dabecfff40a9efdc2d8e201
b8b7020a61418b95c1ea26badaf8db6979778e28dbadddc81fb5010fe27c935b"
;;
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="
78b2dd9c6b1fcd2621fa81c611cf5e2d6950690775038b585c64f364422886e0
5f106805ed86ebf8df287039e53a45cf974391ef4d088c2760776b05b8e48b5d"
00c6e6740ea6a795e33568cd7514855d58408a1180cd820284a7bbf7c46af715
a849a418d0f27e69573e41763c395e924a0b98c16fcdc55599c1c79c27c1c777"
;;
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="
f1a037c367d29d329d041f0bf1d271e60440adc961b6eaa9ea902018a672d4a3
11f0b7efccdb5e7972e3c0fc23693a487abc28b624675c08161d055a016d527e"
24a59e5c6807b07202d4c8021f505d46aa6504897d0c8e7ecba2b5f0f221afd8
874658d2ced1ed2b9bf66c148b78a2e10cad475d0a4db32e68a08900905b89b8"
;;
# placeholders for user-supplied distfiles
ppc64le)
Expand Down
82 changes: 32 additions & 50 deletions srcpkgs/rust/patches/0002-remove-a-bunch-of-unused-junk.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,17 @@ From: q66 <q66@chimera-linux.org>
Date: Fri, 30 May 2025 12:33:02 +0200
Subject: [PATCH 02/15] remove a bunch of unused junk

---
.../rustc_target/src/spec/base/linux_musl.rs | 5 +-
compiler/rustc_target/src/spec/crt_objects.rs | 27 +----
src/bootstrap/configure.py | 100 ------------------
src/bootstrap/src/core/build_steps/compile.rs | 58 +---------
src/bootstrap/src/core/build_steps/llvm.rs | 5 +-
src/bootstrap/src/core/config/config.rs | 8 --
.../src/core/config/target_selection.rs | 4 -
src/bootstrap/src/core/config/toml/rust.rs | 2 -
src/bootstrap/src/core/config/toml/target.rs | 4 -
src/bootstrap/src/core/sanity.rs | 18 +---
src/bootstrap/src/lib.rs | 29 -----
src/bootstrap/src/utils/cc_detect.rs | 24 -----
12 files changed, 8 insertions(+), 276 deletions(-)

diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
index 1bef60240..7cd54b07a 100644
index 6d3124b55..056eeaa81 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 @@
-use crate::spec::{LinkSelfContainedDefault, TargetOptions, base, crt_objects};
+use crate::spec::{TargetOptions, base};
-use crate::spec::{Env, LinkSelfContainedDefault, TargetOptions, base, crt_objects};
+use crate::spec::{Env, TargetOptions, base};

pub(crate) fn opts() -> TargetOptions {
TargetOptions {
env: "musl".into(),
env: Env::Musl,
- pre_link_objects_self_contained: crt_objects::pre_musl_self_contained(),
- post_link_objects_self_contained: crt_objects::post_musl_self_contained(),
- link_self_contained: LinkSelfContainedDefault::InferredForMusl,
Expand Down Expand Up @@ -192,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 6857a40ad..809be74fd 100644
index 02940a802..d105f128b 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -373,54 +373,7 @@ fn copy_self_contained_objects(
@@ -375,54 +375,7 @@ fn copy_self_contained_objects(
t!(fs::create_dir_all(&libdir_self_contained));
let mut target_deps = vec![];

Expand Down Expand Up @@ -251,7 +236,7 @@ index 6857a40ad..809be74fd 100644
let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| {
panic!(
"Target {:?} does not have a \"wasi-root\" key in bootstrap.toml \
@@ -654,15 +607,6 @@ pub fn std_cargo(
@@ -656,15 +609,6 @@ pub fn std_cargo(
.arg("--manifest-path")
.arg(builder.src.join("library/sysroot/Cargo.toml"));

Expand All @@ -268,10 +253,10 @@ index 6857a40ad..809be74fd 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 d43d261ad..2d7f8e26c 100644
index db2a76c4a..d08d8d8d0 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -1317,10 +1317,7 @@ impl Step for CrtBeginEnd {
@@ -1320,10 +1320,7 @@ impl Step for CrtBeginEnd {
run.path("src/llvm-project/compiler-rt/lib/crt")
}

Expand All @@ -284,10 +269,10 @@ index d43d261ad..2d7f8e26c 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 4b7ae6df3..09ccda806 100644
index 2f493658e..0236d8170 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -260,8 +260,6 @@ pub struct Config {
@@ -262,8 +262,6 @@ pub struct Config {
pub print_step_timings: bool,
pub print_step_rusage: bool,

Expand All @@ -296,24 +281,24 @@ index 4b7ae6df3..09ccda806 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
@@ -535,7 +533,6 @@ impl Config {
@@ -539,7 +537,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,
@@ -855,8 +852,6 @@ impl Config {
profiler: target_profiler,
@@ -868,8 +865,6 @@ impl Config {
rpath: target_rpath,
rustflags: target_rustflags,
crt_static: target_crt_static,
- musl_root: target_musl_root,
- musl_libdir: target_musl_libdir,
wasi_root: target_wasi_root,
qemu_rootfs: target_qemu_rootfs,
no_std: target_no_std,
@@ -929,8 +924,6 @@ impl Config {
@@ -942,8 +937,6 @@ impl Config {
target.crt_static = target_crt_static;
target.default_linker = target_default_linker;
target.default_linker_linux_override = default_linker_linux_override;
Expand All @@ -322,19 +307,19 @@ index 4b7ae6df3..09ccda806 100644
target.wasi_root = target_wasi_root.map(PathBuf::from);
target.qemu_rootfs = target_qemu_rootfs.map(PathBuf::from);
target.runner = target_runner;
@@ -1379,7 +1372,6 @@ impl Config {
@@ -1393,7 +1386,6 @@ impl Config {
low_priority: build_low_priority.unwrap_or(false),
mandir: install_mandir.map(PathBuf::from),
miri_info,
- musl_root: rust_musl_root.map(PathBuf::from),
ninja_in_file: llvm_ninja.unwrap_or(true),
nodejs: build_nodejs.map(PathBuf::from),
npm: build_npm.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 40b63a7f9..7fbd8d9d8 100644
index 47f6d6f38..a519b6655 100644
--- a/src/bootstrap/src/core/config/target_selection.rs
+++ b/src/bootstrap/src/core/config/target_selection.rs
@@ -92,10 +92,6 @@ impl TargetSelection {
@@ -96,10 +96,6 @@ impl TargetSelection {
env::var("OSTYPE").is_ok_and(|v| v.to_lowercase().contains("cygwin"))
}

Expand All @@ -346,7 +331,7 @@ index 40b63a7f9..7fbd8d9d8 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 cb48c7d9a..fd6c9b2ee 100644
index 48042ba56..083970f1b 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! {
Expand All @@ -355,9 +340,9 @@ index cb48c7d9a..fd6c9b2ee 100644
channel: Option<String> = "channel",
- musl_root: Option<String> = "musl-root",
rpath: Option<bool> = "rpath",
rustflags: Option<Vec<String>> = "rustflags",
strip: Option<bool> = "strip",
frame_pointers: Option<bool> = "frame-pointers",
@@ -344,7 +343,6 @@ pub fn check_incompatible_options_for_ci_rustc(
@@ -346,7 +345,6 @@ pub fn check_incompatible_options_for_ci_rustc(
debuginfo_level_tools: _,
debuginfo_level_tests: _,
backtrace: _,
Expand All @@ -366,32 +351,32 @@ index cb48c7d9a..fd6c9b2ee 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 4c7afa50b..119f8d512 100644
index 847b75e69..5ad42917a 100644
--- a/src/bootstrap/src/core/config/toml/target.rs
+++ b/src/bootstrap/src/core/config/toml/target.rs
@@ -38,8 +38,6 @@ define_config! {
profiler: Option<StringOrBool> = "profiler",
@@ -39,8 +39,6 @@ define_config! {
rpath: Option<bool> = "rpath",
rustflags: Option<Vec<String>> = "rustflags",
crt_static: Option<bool> = "crt-static",
- musl_root: Option<String> = "musl-root",
- musl_libdir: Option<String> = "musl-libdir",
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
@@ -71,8 +69,6 @@ pub struct Target {
pub profiler: Option<StringOrBool>,
@@ -73,8 +71,6 @@ pub struct Target {
pub rpath: Option<bool>,
pub rustflags: Vec<String>,
pub crt_static: Option<bool>,
- pub musl_root: Option<PathBuf>,
- pub musl_libdir: Option<PathBuf>,
pub wasi_root: Option<PathBuf>,
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 eaa9e3a6a..dac738730 100644
index 50d815401..3818e081b 100644
--- a/src/bootstrap/src/core/sanity.rs
+++ b/src/bootstrap/src/core/sanity.rs
@@ -11,7 +11,7 @@
@@ -12,7 +12,7 @@
use std::collections::{HashMap, HashSet};
use std::ffi::{OsStr, OsString};
use std::path::PathBuf;
Expand All @@ -400,7 +385,7 @@ index eaa9e3a6a..dac738730 100644

#[cfg(not(test))]
use crate::builder::Builder;
@@ -359,22 +359,6 @@ than building it.
@@ -367,22 +367,6 @@ than building it.
continue;
}

Expand All @@ -424,10 +409,10 @@ index eaa9e3a6a..dac738730 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 1aec79630..3f609f3ce 100644
index a31eb0c1c..a78506c39 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -1388,35 +1388,6 @@ impl Build {
@@ -1394,35 +1394,6 @@ impl Build {
}
}

Expand Down Expand Up @@ -498,6 +483,3 @@ index 0662ae304..f6373f44e 100644
t if t.contains("-wasi") => {
let root = if let Some(path) = build.wasi_sdk_path.as_ref() {
path
--
2.51.2

6 changes: 3 additions & 3 deletions srcpkgs/rust/template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
version=1.92.0
version=1.93.0
revision=1
_change_id=147888
_change_id=148795
_llvmver=21
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"
Expand All @@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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=9e0d2ca75c7e275fdc758255bf4b03afb3d65d1543602746907c933b6901c3b8
checksum=69112bd83c321943ffc390b7db2f59ef3febb95dac700f67c2156fbf6b50a705
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src
Expand Down