rust: update to 1.74.0

This commit is contained in:
Marcin Puc 2023-11-16 17:33:26 +01:00 committed by classabbyamp
parent c106eb4966
commit d79be2a27c
2 changed files with 22 additions and 22 deletions

View file

@ -60,10 +60,10 @@ index 61553e71b..88f807a58 100644
base
}
diff --git a/config.example.toml b/config.example.toml
index 5c4bee875..bccf81b0a 100644
index f3c2366d6..fa2b7726e 100644
--- a/config.example.toml
+++ b/config.example.toml
@@ -573,14 +573,6 @@ changelog-seen = 2
@@ -574,14 +574,6 @@ changelog-seen = 2
# behavior -- this may lead to miscompilations or other bugs.
#description = ""
@ -136,7 +136,7 @@ index 2496c2a9d..9aff56181 100644
}
}
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 9c68e5a78..09fb6a721 100644
index 292ccc578..d1f5ff98a 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -256,39 +256,7 @@ fn copy_self_contained_objects(
@ -197,7 +197,7 @@ index 9c68e5a78..09fb6a721 100644
if let Some(p) = builder.wasi_root(target) {
let root = format!(
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 4821d20a8..b9743ce8b 100644
index 836328f94..1d0dc3e98 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -264,7 +264,6 @@ pub struct Config {
@ -208,7 +208,7 @@ index 4821d20a8..b9743ce8b 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
@@ -537,8 +536,6 @@ pub struct Target {
@@ -522,8 +521,6 @@ pub struct Target {
pub profiler: Option<StringOrBool>,
pub rpath: Option<bool>,
pub crt_static: Option<bool>,
@ -217,7 +217,7 @@ index 4821d20a8..b9743ce8b 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub no_std: bool,
@@ -998,7 +995,6 @@ define_config! {
@@ -979,7 +976,6 @@ define_config! {
default_linker: Option<String> = "default-linker",
channel: Option<String> = "channel",
description: Option<String> = "description",
@ -225,7 +225,7 @@ index 4821d20a8..b9743ce8b 100644
rpath: Option<bool> = "rpath",
verbose_tests: Option<bool> = "verbose-tests",
optimize_tests: Option<bool> = "optimize-tests",
@@ -1047,8 +1043,6 @@ define_config! {
@@ -1028,8 +1024,6 @@ define_config! {
profiler: Option<StringOrBool> = "profiler",
rpath: Option<bool> = "rpath",
crt_static: Option<bool> = "crt-static",
@ -234,7 +234,7 @@ index 4821d20a8..b9743ce8b 100644
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
@@ -1430,7 +1424,6 @@ impl Config {
@@ -1412,7 +1406,6 @@ impl Config {
set(&mut config.llvm_tools_enabled, rust.llvm_tools);
config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
config.rustc_default_linker = rust.default_linker;
@ -242,7 +242,7 @@ index 4821d20a8..b9743ce8b 100644
config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
set(
&mut config.deny_warnings,
@@ -1615,8 +1608,6 @@ impl Config {
@@ -1597,8 +1590,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@ -252,10 +252,10 @@ index 4821d20a8..b9743ce8b 100644
target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
target.sanitizers = cfg.sanitizers;
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
index 15e8c1eb9..7749fc54d 100755
index f469dbea6..fe2441e2a 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -110,34 +110,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
@@ -111,34 +111,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
"aarch64-linux-android NDK standalone path")
v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
"x86_64-linux-android NDK standalone path")
@ -291,10 +291,10 @@ index 15e8c1eb9..7749fc54d 100755
"riscv32gc-unknown-linux-musl install directory")
v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 4396bbc51..683ba5480 100644
index 8b8d4b237..06c15d468 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1289,25 +1289,6 @@ impl Build {
@@ -1291,25 +1291,6 @@ impl Build {
}
}
@ -321,7 +321,7 @@ index 4396bbc51..683ba5480 100644
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index 7e83b508e..761e83ddc 100644
index 0febdf250..c84f31d52 100644
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -11,7 +11,6 @@
@ -332,11 +332,11 @@ index 7e83b508e..761e83ddc 100644
use std::path::PathBuf;
use std::process::Command;
@@ -205,28 +204,6 @@ than building it.
}
@@ -215,28 +214,6 @@ than building it.
continue;
}
- // Make sure musl-root is valid
- // 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
@ -358,6 +358,6 @@ index 7e83b508e..761e83ddc 100644
- }
- }
-
// Some environments don't want or need these tools, such as when testing Miri.
// FIXME: it would be better to refactor this code to split necessary setup from pure sanity
// checks, and have a regular flag for skipping the latter. Also see
if need_cmake && target.contains("msvc") {
// There are three builds of cmake on windows: MSVC, MinGW, and
// Cygwin. The Cygwin build does not have generators for Visual

View file

@ -8,7 +8,7 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
version=1.73.0
version=1.74.0
revision=1
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15"
@ -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=96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a
checksum=882b584bc321c5dcfe77cdaa69f277906b936255ef7808fcd5c7492925cf1049
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src