* [PR PATCH] Rust 1.82
@ 2024-10-18 8:50 tranzystorekk
2024-10-18 9:01 ` tranzystorekk
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: tranzystorekk @ 2024-10-18 8:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
There is a new pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages rust
https://github.com/void-linux/void-packages/pull/52674
Rust 1.82
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52674.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-52674.patch --]
[-- Type: text/x-diff, Size: 20863 bytes --]
From ddfa8969b83aa192ed4bff59701e9a9caf28a320 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 17 Oct 2024 19:02:35 +0200
Subject: [PATCH 1/4] rust-bootstrap: update to 1.82.0
---
srcpkgs/rust-bootstrap/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index d89f7006c70184..48e6f8673f5776 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,10 +1,10 @@
# Template file for 'rust-bootstrap'
pkgname=rust-bootstrap
-version=1.81.0
+version=1.82.0
revision=1
short_desc="Rust programming language bootstrap toolchain"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://www.rust-lang.org/"
conflicts="rust>=0"
lib32disabled=yes
@@ -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="
- 8039f645445f99c0e293397b53a6696481b7d58166198605aca0eaa998f4f11f
- 4ed9085460e444de9dee246080126f5e73062802b99aaff620d2aa827f60d972"
+ 92bab38ce88b7738fb62a1bccf496b1b2975fe984cc4fc506903a03ed37e1e4a
+ c7ebb02b6ca349999b3b7dce768efaca5e0d9060f55397523e11a64cd10a9405"
;;
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="
- 988a4e4cdecebe4f4a0c52ec4ade5a5bfc58d6958969f5b1e8aac033bda2613e
- 6ddf80f254e8eea9956308ba89fd68e1ac7885853df9239b07bbc9f047b7562f"
+ 90b61494f5ccfd4d1ca9a5ce4a0af49a253ca435c701d9c44e3e44b5faf70cb8
+ 2eca3d36f7928f877c334909f35fe202fbcecce109ccf3b439284c2cb7849594"
;;
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="
- 02c29b1e17105bb286c36d4f9b28ca21feacb4a98848db103af796411cff1ec5
- 3f2e47fff9320888993139fbd98f4bb44faf9355b25904f36a24a9808ff80240"
+ e08b8490246ae1b6278274f6dd0a648c590a42e0af6aaf220a030cdf1dadf30a
+ 1c99a4c81f51b687ba55746c7d3f19b5b860fe4eff604d3c7d803e08c9cc89bb"
;;
# placeholders for user-supplied distfiles
ppc64le)
From cf1a7f2cd378cae9071b2dc73b66883195610aef Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 17 Oct 2024 19:03:07 +0200
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.82.0
---
srcpkgs/cargo-bootstrap/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 41916f50df6883..e1a529e14b7ecf 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,10 +1,10 @@
# Template file for 'cargo-bootstrap'
pkgname=cargo-bootstrap
-version=1.81.0
+version=1.82.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://www.rust-lang.org/"
conflicts="cargo>=0"
lib32disabled=yes
@@ -24,15 +24,15 @@ esac
case "$XBPS_TARGET_MACHINE" in
i686)
distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
- checksum="44f74fbf64dd2627310e796cfcbde75c42c3435e93e880f1291c0e975b42c1f5"
+ checksum="1cf5bae93e9724f50f1a20a752f05870565e0ce83baa157aad632aa162fd97d5"
;;
x86_64)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
- checksum="c50ee4b1ae8695461930e36d5465dddb7c7a0e0f0aa6cbd60de120b17c38b841"
+ checksum="97aeae783874a932c4500f4d36473297945edf6294d63871784217d608718e70"
;;
x86_64-musl)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
- checksum="ece99ea9b81e283bcaa3333ec01f6776d2a0840f956a4e7e5199fc3761354e36"
+ checksum="a66b3129cb483d55188742769bf8282d9546630f2e25434ff233b22bbec5009e"
;;
# placeholders for user-supplied distfiles
ppc64le)
From eb99473b4404c2ab9c533022bff697334601afd6 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Fri, 18 Oct 2024 00:12:42 +0200
Subject: [PATCH 3/4] rust: update to 1.82.0
---
...dlib-and-musl_root-from-musl-targets.patch | 58 +++++++++----------
...kage-of-musl-libc-for-the-libc-crate.patch | 28 +++++++--
...e-ELFv2-ABI-on-all-powerpc64-targets.patch | 21 ++++---
.../0015-properly-skip-submodules.patch | 13 +++++
srcpkgs/rust/template | 9 +--
5 files changed, 84 insertions(+), 45 deletions(-)
create mode 100644 srcpkgs/rust/patches/0015-properly-skip-submodules.patch
diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 6a6d8e321441dc..cfde28620ba34e 100644
--- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -6,12 +6,11 @@ Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
extended by various void contributors to match our musl setup
diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
-index 5117cadbe..c7d0433bb 100644
+index 42aa1e1a6..c7d0433bb 100644
--- a/compiler/rustc_target/src/spec/base/linux_musl.rs
+++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
-@@ -1,16 +1,9 @@
--use crate::spec::crt_objects;
--use crate::spec::{base, LinkSelfContainedDefault, TargetOptions};
+@@ -1,15 +1,9 @@
+-use crate::spec::{base, crt_objects, LinkSelfContainedDefault, TargetOptions};
+use crate::spec::{base, TargetOptions};
pub fn opts() -> TargetOptions {
@@ -28,10 +27,10 @@ index 5117cadbe..c7d0433bb 100644
base
}
diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
-index 53f710b8f..2a4eec15f 100644
+index e3b6430a4..13a96e2cb 100644
--- a/compiler/rustc_target/src/spec/crt_objects.rs
+++ b/compiler/rustc_target/src/spec/crt_objects.rs
-@@ -61,28 +61,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
+@@ -62,28 +62,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
])
}
@@ -61,10 +60,10 @@ index 53f710b8f..2a4eec15f 100644
new(&[
(LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
diff --git a/config.example.toml b/config.example.toml
-index 26687bcfb..6a23e4cdd 100644
+index f1dc32234..462a86f5b 100644
--- a/config.example.toml
+++ b/config.example.toml
-@@ -591,14 +591,6 @@
+@@ -599,14 +599,6 @@
# behavior -- this may lead to miscompilations or other bugs.
#description = ""
@@ -119,10 +118,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 3e79acad1..ebcdc479a 100644
+index edf18e2eb..7597d6cd2 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -362,39 +362,7 @@ fn copy_self_contained_objects(
+@@ -372,39 +372,7 @@ fn copy_self_contained_objects(
let mut target_deps = vec![];
// Copies the libc and CRT objects.
@@ -163,7 +162,7 @@ index 3e79acad1..ebcdc479a 100644
let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| {
panic!(
"Target {:?} does not have a \"wasi-root\" key in Config.toml \
-@@ -502,15 +470,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -566,15 +534,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path")
.arg(builder.src.join("library/sysroot/Cargo.toml"));
@@ -180,10 +179,10 @@ index 3e79acad1..ebcdc479a 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 9d5aa795c..c44e8a2b2 100644
+index bdfee55d8..18db92320 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
-@@ -314,7 +314,6 @@ pub struct Config {
+@@ -321,7 +321,6 @@ pub struct Config {
pub print_step_rusage: bool,
// Fallback musl-root for all targets
@@ -191,7 +190,7 @@ index 9d5aa795c..c44e8a2b2 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
-@@ -558,8 +557,6 @@ pub struct Target {
+@@ -582,8 +581,6 @@ pub struct Target {
pub profiler: Option<StringOrBool>,
pub rpath: Option<bool>,
pub crt_static: Option<bool>,
@@ -200,7 +199,7 @@ index 9d5aa795c..c44e8a2b2 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub runner: Option<String>,
-@@ -1079,7 +1076,6 @@ define_config! {
+@@ -1104,7 +1101,6 @@ define_config! {
default_linker: Option<String> = "default-linker",
channel: Option<String> = "channel",
description: Option<String> = "description",
@@ -208,7 +207,7 @@ index 9d5aa795c..c44e8a2b2 100644
rpath: Option<bool> = "rpath",
strip: Option<bool> = "strip",
frame_pointers: Option<bool> = "frame-pointers",
-@@ -1133,8 +1129,6 @@ define_config! {
+@@ -1158,8 +1154,6 @@ define_config! {
profiler: Option<StringOrBool> = "profiler",
rpath: Option<bool> = "rpath",
crt_static: Option<bool> = "crt-static",
@@ -217,7 +216,7 @@ index 9d5aa795c..c44e8a2b2 100644
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
-@@ -1599,7 +1593,6 @@ impl Config {
+@@ -1632,7 +1626,6 @@ impl Config {
default_linker,
channel,
description,
@@ -225,7 +224,7 @@ index 9d5aa795c..c44e8a2b2 100644
rpath,
verbose_tests,
optimize_tests,
-@@ -1687,7 +1680,6 @@ impl Config {
+@@ -1722,7 +1715,6 @@ impl Config {
config.rustc_parallel =
parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly");
config.rustc_default_linker = default_linker;
@@ -233,7 +232,7 @@ index 9d5aa795c..c44e8a2b2 100644
config.save_toolstates = save_toolstates.map(PathBuf::from);
set(
&mut config.deny_warnings,
-@@ -1906,8 +1898,6 @@ impl Config {
+@@ -1973,8 +1965,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@@ -242,7 +241,7 @@ index 9d5aa795c..c44e8a2b2 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) {
+@@ -2919,7 +2909,6 @@ fn check_incompatible_options_for_ci_rustc(
split_debuginfo: _,
backtrace: _,
parallel_compiler: _,
@@ -251,18 +250,19 @@ index 9d5aa795c..c44e8a2b2 100644
optimize_tests: _,
codegen_tests: _,
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
-index 2be819d52..daedfb521 100644
+index 60ec57d0d..31b411259 100644
--- a/src/bootstrap/src/core/sanity.rs
+++ b/src/bootstrap/src/core/sanity.rs
-@@ -11,7 +11,6 @@
- use std::collections::HashMap;
- use std::env;
+@@ -11,7 +11,7 @@
+ use std::collections::{HashMap, HashSet};
use std::ffi::{OsStr, OsString};
--use std::fs;
use std::path::PathBuf;
+-use std::{env, fs};
++use std::env;
#[cfg(not(feature = "bootstrap-self-test"))]
-@@ -326,28 +325,6 @@ than building it.
+ use crate::builder::Builder;
+@@ -325,28 +325,6 @@ than building it.
continue;
}
@@ -292,10 +292,10 @@ index 2be819d52..daedfb521 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 a8555b2c3..b0325f309 100644
+index 82b640f54..d906d2186 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
-@@ -1317,25 +1317,6 @@ Executed at: {executed_at}"#,
+@@ -1282,25 +1282,6 @@ Executed at: {executed_at}"#,
}
}
@@ -322,7 +322,7 @@ index a8555b2c3..b0325f309 100644
/// configured.
///
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
-index 20d79e490..1f8b880d8 100644
+index 29e6b74aa..a32fddbac 100644
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
@@ -197,30 +197,6 @@ fn default_compiler(
diff --git a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index 24b7469fe64d69..f4e6962ca55c97 100644
--- a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -3,10 +3,30 @@ From: q66 <daniel@octaforge.org>
Date: Sun, 3 May 2020 18:02:03 +0200
Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate
-diff --git a/vendor/libc-0.2.155/src/unix/mod.rs b/vendor/libc-0.2.155/src/unix/mod.rs
-index 49984d3f0..6c3b5a47e 100644
---- a/vendor/libc-0.2.155/src/unix/mod.rs
-+++ b/vendor/libc-0.2.155/src/unix/mod.rs
+diff --git a/vendor/libc-0.2.157/src/unix/mod.rs b/vendor/libc-0.2.157/src/unix/mod.rs
+index 8b3d988ae..b4ab3db3f 100644
+--- a/vendor/libc-0.2.157/src/unix/mod.rs
++++ b/vendor/libc-0.2.157/src/unix/mod.rs
+@@ -347,7 +347,14 @@ cfg_if! {
+ #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
+ #[link(name = "c", cfg(not(target_feature = "crt-static")))]
+ extern {}
+- } else if #[cfg(any(target_env = "musl", target_env = "ohos"))] {
++ } else if #[cfg(target_env = "musl")] {
++ #[link(name = "c")]
++ extern {}
++ #[cfg_attr(feature = "rustc-dep-of-std",
++ link(name = "gcc", kind = "static", modifiers = "-bundle",
++ cfg(target_feature = "crt-static")))]
++ extern {}
++ } else if #[cfg(target_env = "ohos")] {
+ #[cfg_attr(feature = "rustc-dep-of-std",
+ link(name = "c", kind = "static", modifiers = "-bundle",
+ cfg(target_feature = "crt-static")))]
+diff --git a/vendor/libc-0.2.158/src/unix/mod.rs b/vendor/libc-0.2.158/src/unix/mod.rs
+index 8b3d988ae..b4ab3db3f 100644
+--- a/vendor/libc-0.2.158/src/unix/mod.rs
++++ b/vendor/libc-0.2.158/src/unix/mod.rs
@@ -347,7 +347,14 @@ cfg_if! {
#[link(name = "dl", cfg(not(target_feature = "crt-static")))]
#[link(name = "c", cfg(not(target_feature = "crt-static")))]
diff --git a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
index 9bff1dbd250fa0..a66bb55ec3500f 100644
--- a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
+++ b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
@@ -7,16 +7,21 @@ This patches librustc_target so that ELFv2 is used everywhere, matching our
LLVM. While this is not perfect (it does not allow rustc to compile legacy
binaries), rustc never requests specific ABI from llvm in the first place,
so at least match the environment we have.
----
- compiler/rustc_target/src/abi/call/powerpc64.rs | 9 +--------
- .../rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs | 6 +-----
- 2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/compiler/rustc_target/src/abi/call/powerpc64.rs b/compiler/rustc_target/src/abi/call/powerpc64.rs
-index 359bb8fc0..414c70cea 100644
+index 749eea0ef..1dfa3cbd0 100644
--- a/compiler/rustc_target/src/abi/call/powerpc64.rs
+++ b/compiler/rustc_target/src/abi/call/powerpc64.rs
-@@ -119,14 +119,7 @@ where
+@@ -3,7 +3,7 @@
+ // 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;
+
+ #[derive(Debug, Clone, Copy, PartialEq)]
+@@ -91,14 +91,7 @@ where
Ty: TyAbiInterface<'a, C> + Copy,
C: HasDataLayout + HasTargetSpec,
{
@@ -30,5 +35,5 @@ index 359bb8fc0..414c70cea 100644
- };
+ let abi = ELFv2;
- if !fn_abi.ret.is_ignore() {
- classify_ret(cx, &mut fn_abi.ret, abi);
+ classify(cx, &mut fn_abi.ret, abi, true);
+
diff --git a/srcpkgs/rust/patches/0015-properly-skip-submodules.patch b/srcpkgs/rust/patches/0015-properly-skip-submodules.patch
new file mode 100644
index 00000000000000..9058f2061fb7f7
--- /dev/null
+++ b/srcpkgs/rust/patches/0015-properly-skip-submodules.patch
@@ -0,0 +1,13 @@
+diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
+index 82b640f54..83fe7660c 100644
+--- a/src/bootstrap/src/lib.rs
++++ b/src/bootstrap/src/lib.rs
+@@ -484,7 +484,7 @@ impl Build {
+ pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) {
+ // When testing bootstrap itself, it is much faster to ignore
+ // submodules. Almost all Steps work fine without their submodules.
+- if cfg!(test) && !self.config.submodules() {
++ if cfg!(test) || !self.config.submodules() {
+ return;
+ }
+ self.config.update_submodule(submodule);
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 9b321d99525b79..6144cd97338d74 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,17 +8,17 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.81.0
+version=1.82.0
revision=1
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm18-devel"
depends="rust-std gcc"
short_desc="Safe, concurrent, practical systems language"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, Apache-2.0"
+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=872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7
+checksum=7c53f4509eda184e174efa6ba7d5eeb586585686ce8edefc781a2b11a7cf512a
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src
@@ -58,7 +58,8 @@ post_patch() {
fi
# clear out all the checksum nonsense of patched vendor crates
- _clear_vendor_checksums libc-0.2.155
+ _clear_vendor_checksums libc-0.2.157
+ _clear_vendor_checksums libc-0.2.158
# pre-configure 01-override-config overwrites vendor files
_clear_vendor_checksums onig_sys-69.8.1
From eea90236fd27c5a1d437a70f1488a64388ff232b Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Fri, 18 Oct 2024 00:13:30 +0200
Subject: [PATCH 4/4] cargo: update to 1.82.0
---
srcpkgs/cargo/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index a7099cb09461f7..2280228fa9eebd 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,18 +1,18 @@
# Template file for 'cargo'
pkgname=cargo
-version=1.81.0
+version=1.82.0
revision=1
-_cargo_revision=0.82.0
+_cargo_revision=0.83.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
makedepends="rust libcurl-devel openssl-devel"
depends="rust"
short_desc="Rust package manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, Apache-2.0"
+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=1c89e6a7a28dd78aca53227fd5e14340fcb7cb154ad9655a2f304b5687986cc3
+checksum=53fbf5eb9d0c42ce184bd1b170606db7c878e7ef07ed3b513a67e62e14ca4661
replaces="cargo-tree>=0"
build_options="static bindist"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Rust 1.82
2024-10-18 8:50 [PR PATCH] Rust 1.82 tranzystorekk
@ 2024-10-18 9:01 ` tranzystorekk
2024-10-18 9:58 ` [PR PATCH] [Updated] " tranzystorekk
2024-10-21 8:01 ` [PR PATCH] [Merged]: " tranzystorekk
2 siblings, 0 replies; 4+ messages in thread
From: tranzystorekk @ 2024-10-18 9:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 676 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/52674#issuecomment-2421890110
Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:
## New failures since 1.81
- `riff` cc @0x5c https://0x0.st/XI3g.txt
## Known failures
### `time` crate regressions
- `amp`
- `cargo-c`
- `cargo-crev`
- `cargo-geiger`
- `czkawka`
- `deepfilternet-ladspa`
- `eludris`
- `eww`
- `gcsf`
- `miniserve`
- `ncspot`
- `openpgp-ca`
- `openpgp-card-tools`
- `routinator`
- `rust-cargo-audit`
- `tectonic`
- `typst`
- `typst-lsp`
- `wezterm`
### Other
- `fool`
- `ion`
- `lapce`
- `wasmtime`
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] Rust 1.82
2024-10-18 8:50 [PR PATCH] Rust 1.82 tranzystorekk
2024-10-18 9:01 ` tranzystorekk
@ 2024-10-18 9:58 ` tranzystorekk
2024-10-21 8:01 ` [PR PATCH] [Merged]: " tranzystorekk
2 siblings, 0 replies; 4+ messages in thread
From: tranzystorekk @ 2024-10-18 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages rust
https://github.com/void-linux/void-packages/pull/52674
Rust 1.82
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52674.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-52674.patch --]
[-- Type: text/x-diff, Size: 20933 bytes --]
From 68b506da2f40bdbb5ba712e99f7a3f6fd02fd5f4 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 17 Oct 2024 19:02:35 +0200
Subject: [PATCH 1/4] rust-bootstrap: update to 1.82.0
---
srcpkgs/rust-bootstrap/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index d89f7006c70184..32f90c4d9fb084 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,12 +1,12 @@
# Template file for 'rust-bootstrap'
pkgname=rust-bootstrap
-version=1.81.0
+version=1.82.0
revision=1
short_desc="Rust programming language bootstrap toolchain"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://www.rust-lang.org/"
-conflicts="rust>=0"
+conflicts="rust>=0 rust-std>=0"
lib32disabled=yes
nostrip=yes
repository=bootstrap
@@ -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="
- 8039f645445f99c0e293397b53a6696481b7d58166198605aca0eaa998f4f11f
- 4ed9085460e444de9dee246080126f5e73062802b99aaff620d2aa827f60d972"
+ 92bab38ce88b7738fb62a1bccf496b1b2975fe984cc4fc506903a03ed37e1e4a
+ c7ebb02b6ca349999b3b7dce768efaca5e0d9060f55397523e11a64cd10a9405"
;;
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="
- 988a4e4cdecebe4f4a0c52ec4ade5a5bfc58d6958969f5b1e8aac033bda2613e
- 6ddf80f254e8eea9956308ba89fd68e1ac7885853df9239b07bbc9f047b7562f"
+ 90b61494f5ccfd4d1ca9a5ce4a0af49a253ca435c701d9c44e3e44b5faf70cb8
+ 2eca3d36f7928f877c334909f35fe202fbcecce109ccf3b439284c2cb7849594"
;;
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="
- 02c29b1e17105bb286c36d4f9b28ca21feacb4a98848db103af796411cff1ec5
- 3f2e47fff9320888993139fbd98f4bb44faf9355b25904f36a24a9808ff80240"
+ e08b8490246ae1b6278274f6dd0a648c590a42e0af6aaf220a030cdf1dadf30a
+ 1c99a4c81f51b687ba55746c7d3f19b5b860fe4eff604d3c7d803e08c9cc89bb"
;;
# placeholders for user-supplied distfiles
ppc64le)
From 585f65f9d13af50df5e8296713230dc70b1e51d7 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 17 Oct 2024 19:03:07 +0200
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.82.0
---
srcpkgs/cargo-bootstrap/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 41916f50df6883..e1a529e14b7ecf 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,10 +1,10 @@
# Template file for 'cargo-bootstrap'
pkgname=cargo-bootstrap
-version=1.81.0
+version=1.82.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, Apache-2.0"
+license="Apache-2.0 OR MIT"
homepage="https://www.rust-lang.org/"
conflicts="cargo>=0"
lib32disabled=yes
@@ -24,15 +24,15 @@ esac
case "$XBPS_TARGET_MACHINE" in
i686)
distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
- checksum="44f74fbf64dd2627310e796cfcbde75c42c3435e93e880f1291c0e975b42c1f5"
+ checksum="1cf5bae93e9724f50f1a20a752f05870565e0ce83baa157aad632aa162fd97d5"
;;
x86_64)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
- checksum="c50ee4b1ae8695461930e36d5465dddb7c7a0e0f0aa6cbd60de120b17c38b841"
+ checksum="97aeae783874a932c4500f4d36473297945edf6294d63871784217d608718e70"
;;
x86_64-musl)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
- checksum="ece99ea9b81e283bcaa3333ec01f6776d2a0840f956a4e7e5199fc3761354e36"
+ checksum="a66b3129cb483d55188742769bf8282d9546630f2e25434ff233b22bbec5009e"
;;
# placeholders for user-supplied distfiles
ppc64le)
From f5f6f7bf87eaaf93c6306e6c3d1c15d73bd798b2 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Fri, 18 Oct 2024 00:12:42 +0200
Subject: [PATCH 3/4] rust: update to 1.82.0
---
...dlib-and-musl_root-from-musl-targets.patch | 58 +++++++++----------
...kage-of-musl-libc-for-the-libc-crate.patch | 28 +++++++--
...e-ELFv2-ABI-on-all-powerpc64-targets.patch | 21 ++++---
.../0015-properly-skip-submodules.patch | 13 +++++
srcpkgs/rust/template | 9 +--
5 files changed, 84 insertions(+), 45 deletions(-)
create mode 100644 srcpkgs/rust/patches/0015-properly-skip-submodules.patch
diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index 6a6d8e321441dc..cfde28620ba34e 100644
--- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -6,12 +6,11 @@ Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
extended by various void contributors to match our musl setup
diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
-index 5117cadbe..c7d0433bb 100644
+index 42aa1e1a6..c7d0433bb 100644
--- a/compiler/rustc_target/src/spec/base/linux_musl.rs
+++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
-@@ -1,16 +1,9 @@
--use crate::spec::crt_objects;
--use crate::spec::{base, LinkSelfContainedDefault, TargetOptions};
+@@ -1,15 +1,9 @@
+-use crate::spec::{base, crt_objects, LinkSelfContainedDefault, TargetOptions};
+use crate::spec::{base, TargetOptions};
pub fn opts() -> TargetOptions {
@@ -28,10 +27,10 @@ index 5117cadbe..c7d0433bb 100644
base
}
diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
-index 53f710b8f..2a4eec15f 100644
+index e3b6430a4..13a96e2cb 100644
--- a/compiler/rustc_target/src/spec/crt_objects.rs
+++ b/compiler/rustc_target/src/spec/crt_objects.rs
-@@ -61,28 +61,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
+@@ -62,28 +62,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
])
}
@@ -61,10 +60,10 @@ index 53f710b8f..2a4eec15f 100644
new(&[
(LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
diff --git a/config.example.toml b/config.example.toml
-index 26687bcfb..6a23e4cdd 100644
+index f1dc32234..462a86f5b 100644
--- a/config.example.toml
+++ b/config.example.toml
-@@ -591,14 +591,6 @@
+@@ -599,14 +599,6 @@
# behavior -- this may lead to miscompilations or other bugs.
#description = ""
@@ -119,10 +118,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 3e79acad1..ebcdc479a 100644
+index edf18e2eb..7597d6cd2 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -362,39 +362,7 @@ fn copy_self_contained_objects(
+@@ -372,39 +372,7 @@ fn copy_self_contained_objects(
let mut target_deps = vec![];
// Copies the libc and CRT objects.
@@ -163,7 +162,7 @@ index 3e79acad1..ebcdc479a 100644
let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| {
panic!(
"Target {:?} does not have a \"wasi-root\" key in Config.toml \
-@@ -502,15 +470,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -566,15 +534,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path")
.arg(builder.src.join("library/sysroot/Cargo.toml"));
@@ -180,10 +179,10 @@ index 3e79acad1..ebcdc479a 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 9d5aa795c..c44e8a2b2 100644
+index bdfee55d8..18db92320 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
-@@ -314,7 +314,6 @@ pub struct Config {
+@@ -321,7 +321,6 @@ pub struct Config {
pub print_step_rusage: bool,
// Fallback musl-root for all targets
@@ -191,7 +190,7 @@ index 9d5aa795c..c44e8a2b2 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
-@@ -558,8 +557,6 @@ pub struct Target {
+@@ -582,8 +581,6 @@ pub struct Target {
pub profiler: Option<StringOrBool>,
pub rpath: Option<bool>,
pub crt_static: Option<bool>,
@@ -200,7 +199,7 @@ index 9d5aa795c..c44e8a2b2 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub runner: Option<String>,
-@@ -1079,7 +1076,6 @@ define_config! {
+@@ -1104,7 +1101,6 @@ define_config! {
default_linker: Option<String> = "default-linker",
channel: Option<String> = "channel",
description: Option<String> = "description",
@@ -208,7 +207,7 @@ index 9d5aa795c..c44e8a2b2 100644
rpath: Option<bool> = "rpath",
strip: Option<bool> = "strip",
frame_pointers: Option<bool> = "frame-pointers",
-@@ -1133,8 +1129,6 @@ define_config! {
+@@ -1158,8 +1154,6 @@ define_config! {
profiler: Option<StringOrBool> = "profiler",
rpath: Option<bool> = "rpath",
crt_static: Option<bool> = "crt-static",
@@ -217,7 +216,7 @@ index 9d5aa795c..c44e8a2b2 100644
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
-@@ -1599,7 +1593,6 @@ impl Config {
+@@ -1632,7 +1626,6 @@ impl Config {
default_linker,
channel,
description,
@@ -225,7 +224,7 @@ index 9d5aa795c..c44e8a2b2 100644
rpath,
verbose_tests,
optimize_tests,
-@@ -1687,7 +1680,6 @@ impl Config {
+@@ -1722,7 +1715,6 @@ impl Config {
config.rustc_parallel =
parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly");
config.rustc_default_linker = default_linker;
@@ -233,7 +232,7 @@ index 9d5aa795c..c44e8a2b2 100644
config.save_toolstates = save_toolstates.map(PathBuf::from);
set(
&mut config.deny_warnings,
-@@ -1906,8 +1898,6 @@ impl Config {
+@@ -1973,8 +1965,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@@ -242,7 +241,7 @@ index 9d5aa795c..c44e8a2b2 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) {
+@@ -2919,7 +2909,6 @@ fn check_incompatible_options_for_ci_rustc(
split_debuginfo: _,
backtrace: _,
parallel_compiler: _,
@@ -251,18 +250,19 @@ index 9d5aa795c..c44e8a2b2 100644
optimize_tests: _,
codegen_tests: _,
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
-index 2be819d52..daedfb521 100644
+index 60ec57d0d..31b411259 100644
--- a/src/bootstrap/src/core/sanity.rs
+++ b/src/bootstrap/src/core/sanity.rs
-@@ -11,7 +11,6 @@
- use std::collections::HashMap;
- use std::env;
+@@ -11,7 +11,7 @@
+ use std::collections::{HashMap, HashSet};
use std::ffi::{OsStr, OsString};
--use std::fs;
use std::path::PathBuf;
+-use std::{env, fs};
++use std::env;
#[cfg(not(feature = "bootstrap-self-test"))]
-@@ -326,28 +325,6 @@ than building it.
+ use crate::builder::Builder;
+@@ -325,28 +325,6 @@ than building it.
continue;
}
@@ -292,10 +292,10 @@ index 2be819d52..daedfb521 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 a8555b2c3..b0325f309 100644
+index 82b640f54..d906d2186 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
-@@ -1317,25 +1317,6 @@ Executed at: {executed_at}"#,
+@@ -1282,25 +1282,6 @@ Executed at: {executed_at}"#,
}
}
@@ -322,7 +322,7 @@ index a8555b2c3..b0325f309 100644
/// configured.
///
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
-index 20d79e490..1f8b880d8 100644
+index 29e6b74aa..a32fddbac 100644
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
@@ -197,30 +197,6 @@ fn default_compiler(
diff --git a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index 24b7469fe64d69..f4e6962ca55c97 100644
--- a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -3,10 +3,30 @@ From: q66 <daniel@octaforge.org>
Date: Sun, 3 May 2020 18:02:03 +0200
Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate
-diff --git a/vendor/libc-0.2.155/src/unix/mod.rs b/vendor/libc-0.2.155/src/unix/mod.rs
-index 49984d3f0..6c3b5a47e 100644
---- a/vendor/libc-0.2.155/src/unix/mod.rs
-+++ b/vendor/libc-0.2.155/src/unix/mod.rs
+diff --git a/vendor/libc-0.2.157/src/unix/mod.rs b/vendor/libc-0.2.157/src/unix/mod.rs
+index 8b3d988ae..b4ab3db3f 100644
+--- a/vendor/libc-0.2.157/src/unix/mod.rs
++++ b/vendor/libc-0.2.157/src/unix/mod.rs
+@@ -347,7 +347,14 @@ cfg_if! {
+ #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
+ #[link(name = "c", cfg(not(target_feature = "crt-static")))]
+ extern {}
+- } else if #[cfg(any(target_env = "musl", target_env = "ohos"))] {
++ } else if #[cfg(target_env = "musl")] {
++ #[link(name = "c")]
++ extern {}
++ #[cfg_attr(feature = "rustc-dep-of-std",
++ link(name = "gcc", kind = "static", modifiers = "-bundle",
++ cfg(target_feature = "crt-static")))]
++ extern {}
++ } else if #[cfg(target_env = "ohos")] {
+ #[cfg_attr(feature = "rustc-dep-of-std",
+ link(name = "c", kind = "static", modifiers = "-bundle",
+ cfg(target_feature = "crt-static")))]
+diff --git a/vendor/libc-0.2.158/src/unix/mod.rs b/vendor/libc-0.2.158/src/unix/mod.rs
+index 8b3d988ae..b4ab3db3f 100644
+--- a/vendor/libc-0.2.158/src/unix/mod.rs
++++ b/vendor/libc-0.2.158/src/unix/mod.rs
@@ -347,7 +347,14 @@ cfg_if! {
#[link(name = "dl", cfg(not(target_feature = "crt-static")))]
#[link(name = "c", cfg(not(target_feature = "crt-static")))]
diff --git a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
index 9bff1dbd250fa0..a66bb55ec3500f 100644
--- a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
+++ b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
@@ -7,16 +7,21 @@ This patches librustc_target so that ELFv2 is used everywhere, matching our
LLVM. While this is not perfect (it does not allow rustc to compile legacy
binaries), rustc never requests specific ABI from llvm in the first place,
so at least match the environment we have.
----
- compiler/rustc_target/src/abi/call/powerpc64.rs | 9 +--------
- .../rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs | 6 +-----
- 2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/compiler/rustc_target/src/abi/call/powerpc64.rs b/compiler/rustc_target/src/abi/call/powerpc64.rs
-index 359bb8fc0..414c70cea 100644
+index 749eea0ef..1dfa3cbd0 100644
--- a/compiler/rustc_target/src/abi/call/powerpc64.rs
+++ b/compiler/rustc_target/src/abi/call/powerpc64.rs
-@@ -119,14 +119,7 @@ where
+@@ -3,7 +3,7 @@
+ // 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;
+
+ #[derive(Debug, Clone, Copy, PartialEq)]
+@@ -91,14 +91,7 @@ where
Ty: TyAbiInterface<'a, C> + Copy,
C: HasDataLayout + HasTargetSpec,
{
@@ -30,5 +35,5 @@ index 359bb8fc0..414c70cea 100644
- };
+ let abi = ELFv2;
- if !fn_abi.ret.is_ignore() {
- classify_ret(cx, &mut fn_abi.ret, abi);
+ classify(cx, &mut fn_abi.ret, abi, true);
+
diff --git a/srcpkgs/rust/patches/0015-properly-skip-submodules.patch b/srcpkgs/rust/patches/0015-properly-skip-submodules.patch
new file mode 100644
index 00000000000000..9058f2061fb7f7
--- /dev/null
+++ b/srcpkgs/rust/patches/0015-properly-skip-submodules.patch
@@ -0,0 +1,13 @@
+diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
+index 82b640f54..83fe7660c 100644
+--- a/src/bootstrap/src/lib.rs
++++ b/src/bootstrap/src/lib.rs
+@@ -484,7 +484,7 @@ impl Build {
+ pub fn require_submodule(&self, submodule: &str, err_hint: Option<&str>) {
+ // When testing bootstrap itself, it is much faster to ignore
+ // submodules. Almost all Steps work fine without their submodules.
+- if cfg!(test) && !self.config.submodules() {
++ if cfg!(test) || !self.config.submodules() {
+ return;
+ }
+ self.config.update_submodule(submodule);
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 9b321d99525b79..6144cd97338d74 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,17 +8,17 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.81.0
+version=1.82.0
revision=1
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm18-devel"
depends="rust-std gcc"
short_desc="Safe, concurrent, practical systems language"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, Apache-2.0"
+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=872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7
+checksum=7c53f4509eda184e174efa6ba7d5eeb586585686ce8edefc781a2b11a7cf512a
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src
@@ -58,7 +58,8 @@ post_patch() {
fi
# clear out all the checksum nonsense of patched vendor crates
- _clear_vendor_checksums libc-0.2.155
+ _clear_vendor_checksums libc-0.2.157
+ _clear_vendor_checksums libc-0.2.158
# pre-configure 01-override-config overwrites vendor files
_clear_vendor_checksums onig_sys-69.8.1
From d9bd257483b0bf78f636ef122c5c57c6ee9c59d5 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Fri, 18 Oct 2024 00:13:30 +0200
Subject: [PATCH 4/4] cargo: update to 1.82.0
---
srcpkgs/cargo/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index a7099cb09461f7..2280228fa9eebd 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,18 +1,18 @@
# Template file for 'cargo'
pkgname=cargo
-version=1.81.0
+version=1.82.0
revision=1
-_cargo_revision=0.82.0
+_cargo_revision=0.83.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
makedepends="rust libcurl-devel openssl-devel"
depends="rust"
short_desc="Rust package manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT, Apache-2.0"
+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=1c89e6a7a28dd78aca53227fd5e14340fcb7cb154ad9655a2f304b5687986cc3
+checksum=53fbf5eb9d0c42ce184bd1b170606db7c878e7ef07ed3b513a67e62e14ca4661
replaces="cargo-tree>=0"
build_options="static bindist"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: Rust 1.82
2024-10-18 8:50 [PR PATCH] Rust 1.82 tranzystorekk
2024-10-18 9:01 ` tranzystorekk
2024-10-18 9:58 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-10-21 8:01 ` tranzystorekk
2 siblings, 0 replies; 4+ messages in thread
From: tranzystorekk @ 2024-10-21 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1070 bytes --]
There's a merged pull request on the void-packages repository
Rust 1.82
https://github.com/void-linux/void-packages/pull/52674
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-21 8:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-18 8:50 [PR PATCH] Rust 1.82 tranzystorekk
2024-10-18 9:01 ` tranzystorekk
2024-10-18 9:58 ` [PR PATCH] [Updated] " tranzystorekk
2024-10-21 8:01 ` [PR PATCH] [Merged]: " tranzystorekk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).