snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

rust: update to 1.81.0

This commit is contained in:
tranzystorekk 2024-09-05 21:21:36 +02:00
parent 510ec593b5
commit 6e53e90fdc
3 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,10 +61,10 @@ index 53f710b8f..2a4eec15f 100644
new(&[
(LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
diff --git a/config.example.toml b/config.example.toml
index 5c1fac767..a95c9aa88 100644
index 26687bcfb..6a23e4cdd 100644
--- a/config.example.toml
+++ b/config.example.toml
@@ -588,14 +588,6 @@
@@ -591,14 +591,6 @@
# behavior -- this may lead to miscompilations or other bugs.
#description = ""
@ -119,10 +119,10 @@ index 768aac912..6aebd9189 100755
"riscv32gc-unknown-linux-musl install directory")
v("musl-root-riscv64gc", "target.riscv64gc-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 1d46a158f..b9a6dd981 100644
index 3e79acad1..ebcdc479a 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -361,39 +361,7 @@ fn copy_self_contained_objects(
@@ -362,39 +362,7 @@ fn copy_self_contained_objects(
let mut target_deps = vec![];
// Copies the libc and CRT objects.
@ -163,7 +163,7 @@ index 1d46a158f..b9a6dd981 100644
let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| {
panic!(
"Target {:?} does not have a \"wasi-root\" key in Config.toml \
@@ -501,15 +469,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
@@ -502,15 +470,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path")
.arg(builder.src.join("library/sysroot/Cargo.toml"));
@ -180,18 +180,18 @@ index 1d46a158f..b9a6dd981 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 149a62f88..53b1b97be 100644
index 9d5aa795c..c44e8a2b2 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -317,7 +317,6 @@ pub struct Config {
pub missing_tools: bool, // FIXME: Deprecated field. Remove it at 2024.
@@ -314,7 +314,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>,
@@ -588,8 +587,6 @@ pub struct Target {
@@ -558,8 +557,6 @@ pub struct Target {
pub profiler: Option<StringOrBool>,
pub rpath: Option<bool>,
pub crt_static: Option<bool>,
@ -200,7 +200,7 @@ index 149a62f88..53b1b97be 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub runner: Option<String>,
@@ -1097,7 +1094,6 @@ define_config! {
@@ -1079,7 +1076,6 @@ define_config! {
default_linker: Option<String> = "default-linker",
channel: Option<String> = "channel",
description: Option<String> = "description",
@ -208,7 +208,7 @@ index 149a62f88..53b1b97be 100644
rpath: Option<bool> = "rpath",
strip: Option<bool> = "strip",
frame_pointers: Option<bool> = "frame-pointers",
@@ -1151,8 +1147,6 @@ define_config! {
@@ -1133,8 +1129,6 @@ define_config! {
profiler: Option<StringOrBool> = "profiler",
rpath: Option<bool> = "rpath",
crt_static: Option<bool> = "crt-static",
@ -217,7 +217,7 @@ index 149a62f88..53b1b97be 100644
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
@@ -1582,7 +1576,6 @@ impl Config {
@@ -1599,7 +1593,6 @@ impl Config {
default_linker,
channel,
description,
@ -225,7 +225,7 @@ index 149a62f88..53b1b97be 100644
rpath,
verbose_tests,
optimize_tests,
@@ -1695,7 +1688,6 @@ impl Config {
@@ -1687,7 +1680,6 @@ impl Config {
config.rustc_parallel =
parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly");
config.rustc_default_linker = default_linker;
@ -233,7 +233,7 @@ index 149a62f88..53b1b97be 100644
config.save_toolstates = save_toolstates.map(PathBuf::from);
set(
&mut config.deny_warnings,
@@ -1894,8 +1886,6 @@ impl Config {
@@ -1906,8 +1898,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@ -242,8 +242,16 @@ index 149a62f88..53b1b97be 100644
target.wasi_root = cfg.wasi_root.map(PathBuf::from);
target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
target.runner = cfg.runner;
@@ -2667,7 +2657,6 @@ fn check_incompatible_options_for_ci_rustc(rust: &Rust) {
split_debuginfo: _,
backtrace: _,
parallel_compiler: _,
- musl_root: _,
verbose_tests: _,
optimize_tests: _,
codegen_tests: _,
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
index e03b1e179..e61335d9b 100644
index 2be819d52..daedfb521 100644
--- a/src/bootstrap/src/core/sanity.rs
+++ b/src/bootstrap/src/core/sanity.rs
@@ -11,7 +11,6 @@
@ -252,9 +260,9 @@ index e03b1e179..e61335d9b 100644
use std::ffi::{OsStr, OsString};
-use std::fs;
use std::path::PathBuf;
use std::process::Command;
@@ -220,28 +219,6 @@ than building it.
#[cfg(not(feature = "bootstrap-self-test"))]
@@ -326,28 +325,6 @@ than building it.
continue;
}
@ -284,10 +292,10 @@ index e03b1e179..e61335d9b 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 663a2d8e1..d2345a54f 100644
index a8555b2c3..b0325f309 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -1355,25 +1355,6 @@ impl Build {
@@ -1317,25 +1317,6 @@ Executed at: {executed_at}"#,
}
}
@ -314,7 +322,7 @@ index 663a2d8e1..d2345a54f 100644
/// configured.
///
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
index 540b86713..f01c87085 100644
index 20d79e490..1f8b880d8 100644
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
@@ -197,30 +197,6 @@ fn default_compiler(

18
srcpkgs/rust/patches/0006-fix-rustdoc-when-cross-compiling.patch
View File

@ -4,20 +4,20 @@ Date: Mon, 20 Dec 2021 01:48:14 +0100
Subject: [PATCH 06/15] fix rustdoc when cross-compiling
diff --git a/src/bootstrap/src/bin/rustdoc.rs b/src/bootstrap/src/bin/rustdoc.rs
index dbbce6fe2..86365e330 100644
index ba6b0c2db..c6d32100b 100644
--- a/src/bootstrap/src/bin/rustdoc.rs
+++ b/src/bootstrap/src/bin/rustdoc.rs
@@ -7,6 +7,7 @@ use std::ffi::OsString;
@@ -6,6 +6,7 @@ use std::env;
use std::path::PathBuf;
use std::process::Command;
+#[allow(unused)]
use dylib_util::{dylib_path, dylib_path_var};
#[path = "../utils/bin_helpers.rs"]
@@ -29,9 +30,6 @@ fn main() {
use shared_helpers::{
dylib_path, dylib_path_var, maybe_dump, parse_rustc_stage, parse_rustc_verbose,
parse_value_from_args,
@@ -28,9 +29,6 @@ fn main() {
// is passed (a bit janky...)
let target = args.windows(2).find(|w| &*w[0] == "--target").and_then(|w| w[1].to_str());
let target = parse_value_from_args(&args, "--target");
- let mut dylib_path = dylib_path();
- dylib_path.insert(0, PathBuf::from(libdir.clone()));
@ -25,7 +25,7 @@ index dbbce6fe2..86365e330 100644
let mut cmd = Command::new(rustdoc);
if target.is_some() {
@@ -44,7 +42,7 @@ fn main() {
@@ -43,7 +41,7 @@ fn main() {
}
cmd.args(&args);
@ -34,7 +34,7 @@ index dbbce6fe2..86365e330 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
@@ -78,7 +76,7 @@ fn main() {
@@ -68,7 +66,7 @@ fn main() {
eprintln!(
"rustdoc command: {:?}={:?} {:?}",
dylib_path_var(),

6
srcpkgs/rust/template
View File

@ -8,7 +8,7 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
version=1.80.1
version=1.81.0
revision=1
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm18-devel"
@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
checksum=2c0b8f643942dcb810cbcc50f292564b1b6e44db5d5f45091153996df95d2dc4
checksum=872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src
@ -127,6 +127,8 @@ do_configure() {
--release-description="Void Linux" \
--llvm-libunwind=no \
--llvm-config=/usr/bin/llvm-config \
--disable-lld \
--disable-llvm-bitcode-linker \
--tools=clippy,rustdoc,rustfmt,rust-analyzer-proc-macro-srv \
--set="rust.optimize=true" \
--set="rust.debug=false" \