* [PR PATCH] Rust 1.79
@ 2024-06-13 23:21 tranzystorekk
2024-06-13 23:26 ` tranzystorekk
2024-06-21 19:22 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 2 replies; 3+ messages in thread
From: tranzystorekk @ 2024-06-13 23:21 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/50822
Rust 1.79
<!-- 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/50822.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-50822.patch --]
[-- Type: text/x-diff, Size: 15371 bytes --]
From 7258c0e4f86c58cc3c56e74ec2a858edaf271fee Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 13 Jun 2024 17:14:35 +0200
Subject: [PATCH 1/4] rust-bootstrap: update to 1.79.0
---
srcpkgs/rust-bootstrap/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 6e0658375be43c..f78831b709513d 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.78.0
+version=1.79.0
revision=1
short_desc="Rust programming language bootstrap toolchain"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -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="
- 8ba9c213e5daaf08a13c5787a4ea0d7ae8d1e7004126de2b8dc6a6dcd798becd
- 9e5e02311853354c1540e1b4da6c1686616cea9d3a233c033023f36d950977c0"
+ 4695a6eb66252d519510ca0a859803fff3a5041f71004404df0ccc9fbf0298d5
+ 158294f7c424ef75d84046b573f225c15d531745cc79d416a18c11aa8253830e"
;;
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="
- 3994971e5923716d54e4b574ce238f04c4e20cda03990670f7cc3f87d36e5499
- 95aece42a336f237c5bac5c5d9aca051b7f0bd3e6a64fb3c5828e6d0d3af2e8c"
+ a04cf42022d0a5faf01c31082bfb1dde9c38409f0ca6da90a3e40faa03e797ae
+ 2c914483c0882d44af2e50a181cbd2c953d672d50b31aa669ee2346cade1f108"
;;
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="
- 82bbe731cde3d323147b34aaf5ed2251b70ade44b96a69b5d93b8968d7af96ea
- f2c30e43184b050f56cc2ac98af0752a881f104c08456731a9cd9e21d9f7dfb5"
+ 155deffbdc08c963bd47108eaccf0db81d5f9bc6bb4a4cefa03e40ae9e2981fc
+ 30b9418561e6a7c18396a259304d3ddb4ad9d262f0ed6f227e08d232b8b32e8c"
;;
# placeholders for user-supplied distfiles
ppc64le)
From bb5abd6fa7552547e37dfaa08848927ce5a71328 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 13 Jun 2024 17:14:58 +0200
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.79.0
---
srcpkgs/cargo-bootstrap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index ceadf8be595647..149b708c352122 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.78.0
+version=1.79.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,15 +24,15 @@ esac
case "$XBPS_TARGET_MACHINE" in
i686)
distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
- checksum="472230d0a04c6a2db80671549cb970176299817883dafbffb15c993f5aeaa909"
+ checksum="57bd43f363ebd399a38aa4ac3b137e9172706770f8b23479f9dd859c6ae779ab"
;;
x86_64)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
- checksum="f8aacf7a101eb10dc000b8bf26de90a9d0ce678d02ccf70430ed20dd31ecec6b"
+ checksum="07fcadd27b645ad58ff4dae5ef166fd730311bbae8f25f6640fe1bfd2a1f3c3c"
;;
x86_64-musl)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
- checksum="681721c1b07014c346f1114ed800e5f5c5eb64a7a22d808f8c0bbc5616374fa6"
+ checksum="c053ba22b95615f41f27b42f5bacf3fbb26abba24ac01d2638877a584ff19738"
;;
# placeholders for user-supplied distfiles
ppc64le)
From 7b1433a21d840d8963baa4eab08543c4d6b4763b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 13 Jun 2024 17:15:22 +0200
Subject: [PATCH 3/4] rust: update to 1.79.0
---
...dlib-and-musl_root-from-musl-targets.patch | 56 +++++++++----------
...kage-of-musl-libc-for-the-libc-crate.patch | 10 ++--
srcpkgs/rust/template | 10 +---
3 files changed, 36 insertions(+), 40 deletions(-)
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 5e66e84d56ddb5..324491eed9fa71 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
@@ -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 f94553dd6..65139e167 100644
+index 5c1fac767..a95c9aa88 100644
--- a/config.example.toml
+++ b/config.example.toml
-@@ -591,14 +591,6 @@
+@@ -588,14 +588,6 @@
# behavior -- this may lead to miscompilations or other bugs.
#description = ""
@@ -80,7 +80,7 @@ index f94553dd6..65139e167 100644
# platforms to ensure that the compiler is usable by default from the build
# directory (as it links to a number of dynamic libraries). This may not be
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 818a7daad..5edc363f6 100755
+index 768aac912..6aebd9189 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -99,34 +99,6 @@ v("llvm-config", None, "set path to llvm-config")
@@ -119,7 +119,7 @@ index 818a7daad..5edc363f6 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 e927b491c..00475eb66 100644
+index 1d46a158f..b9a6dd981 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(
@@ -160,10 +160,10 @@ index e927b491c..00475eb66 100644
- }
- } else if target.contains("-wasi") {
+ if target.contains("-wasi") {
- let srcdir = builder
- .wasi_root(target)
- .unwrap_or_else(|| {
-@@ -504,15 +472,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+ 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
.arg("--manifest-path")
.arg(builder.src.join("library/sysroot/Cargo.toml"));
@@ -177,13 +177,13 @@ index e927b491c..00475eb66 100644
- }
-
if target.contains("-wasi") {
- if let Some(p) = builder.wasi_root(target) {
- let root = format!(
+ 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 3e1bc9a9a..3eef99651 100644
+index 149a62f88..53b1b97be 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
-@@ -310,7 +310,6 @@ pub struct Config {
+@@ -317,7 +317,6 @@ pub struct Config {
pub missing_tools: bool, // FIXME: Deprecated field. Remove it at 2024.
// Fallback musl-root for all targets
@@ -191,7 +191,7 @@ index 3e1bc9a9a..3eef99651 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
-@@ -579,8 +578,6 @@ pub struct Target {
+@@ -588,8 +587,6 @@ pub struct Target {
pub profiler: Option<StringOrBool>,
pub rpath: Option<bool>,
pub crt_static: Option<bool>,
@@ -200,7 +200,7 @@ index 3e1bc9a9a..3eef99651 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub runner: Option<String>,
-@@ -1089,7 +1086,6 @@ define_config! {
+@@ -1097,7 +1094,6 @@ define_config! {
default_linker: Option<String> = "default-linker",
channel: Option<String> = "channel",
description: Option<String> = "description",
@@ -208,7 +208,7 @@ index 3e1bc9a9a..3eef99651 100644
rpath: Option<bool> = "rpath",
strip: Option<bool> = "strip",
frame_pointers: Option<bool> = "frame-pointers",
-@@ -1143,8 +1139,6 @@ define_config! {
+@@ -1151,8 +1147,6 @@ define_config! {
profiler: Option<StringOrBool> = "profiler",
rpath: Option<bool> = "rpath",
crt_static: Option<bool> = "crt-static",
@@ -217,7 +217,7 @@ index 3e1bc9a9a..3eef99651 100644
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
-@@ -1564,7 +1558,6 @@ impl Config {
+@@ -1582,7 +1576,6 @@ impl Config {
default_linker,
channel,
description,
@@ -225,7 +225,7 @@ index 3e1bc9a9a..3eef99651 100644
rpath,
verbose_tests,
optimize_tests,
-@@ -1677,7 +1670,6 @@ impl Config {
+@@ -1695,7 +1688,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 3e1bc9a9a..3eef99651 100644
config.save_toolstates = save_toolstates.map(PathBuf::from);
set(
&mut config.deny_warnings,
-@@ -1876,8 +1868,6 @@ impl Config {
+@@ -1894,8 +1886,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@@ -284,10 +284,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 5ed6b357e..9667bb0e0 100644
+index 663a2d8e1..d2345a54f 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
-@@ -1319,25 +1319,6 @@ impl Build {
+@@ -1355,25 +1355,6 @@ impl Build {
}
}
@@ -310,14 +310,14 @@ index 5ed6b357e..9667bb0e0 100644
- self.musl_root(target).map(|root| root.join("lib"))
- }
-
- /// Returns the sysroot for the wasi target, if defined
- 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)
+ /// Returns the `lib` directory for the WASI target specified, if
+ /// configured.
+ ///
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
-index 3ba4e0cb6..31ffacb25 100644
+index 540b86713..f01c87085 100644
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
-@@ -199,30 +199,6 @@ fn default_compiler(
+@@ -197,30 +197,6 @@ fn default_compiler(
}
}
@@ -345,6 +345,6 @@ index 3ba4e0cb6..31ffacb25 100644
- }
- }
-
- _ => None,
- }
- }
+ t if t.contains("-wasi") => {
+ let root = PathBuf::from(std::env::var_os("WASI_SDK_PATH")?);
+ let compiler = match 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 0f09cef58f7081..0924889cbfaa3e 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,11 +3,11 @@ 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/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
-index b005970b9..c53093a09 100644
---- a/vendor/libc/src/unix/mod.rs
-+++ b/vendor/libc/src/unix/mod.rs
-@@ -351,7 +351,14 @@ cfg_if! {
+diff --git a/vendor/libc-0.2.153/src/unix/mod.rs b/vendor/libc-0.2.153/src/unix/mod.rs
+index 3dca83305..aae5b0ca9 100644
+--- a/vendor/libc-0.2.153/src/unix/mod.rs
++++ b/vendor/libc-0.2.153/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 {}
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 4c1c4b0170861b..a37b076528c7c8 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.78.0
+version=1.79.0
revision=1
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-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=ff544823a5cb27f2738128577f1e7e00ee8f4c83f2a348781ae4fc355e91d5a9
+checksum=172ecf3c7d1f9d9fb16cd2a628869782670416ded0129e524a86751f961448c0
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src
@@ -58,11 +58,7 @@ post_patch() {
fi
# clear out all the checksum nonsense of patched vendor crates
- _clear_vendor_checksums libc
- _clear_vendor_checksums typenum
- _clear_vendor_checksums cc
- _clear_vendor_checksums target-lexicon
- _clear_vendor_checksums tikv-jemallocator
+ _clear_vendor_checksums libc-0.2.153
}
do_configure() {
From ae9445b76bb923aef95be500f0d4abbcf16112ea Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 13 Jun 2024 17:15:46 +0200
Subject: [PATCH 4/4] cargo: update to 1.79.0
---
srcpkgs/cargo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 30caa26d74b257..5873a19e074600 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
# Template file for 'cargo'
pkgname=cargo
-version=1.78.0
+version=1.79.0
revision=1
-_cargo_revision=0.79.0
+_cargo_revision=0.80.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
makedepends="rust libcurl-devel openssl-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://crates.io/"
distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
-checksum=b9de52bc7452fd74ab344b636f054de3e9a67cf167567cc4ce948e9219e81d98
+checksum=542efc5daa159e2942d454eb2815247a96589363977429bd473f8cac8a55636e
replaces="cargo-tree>=0"
build_options="static bindist"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Rust 1.79
2024-06-13 23:21 [PR PATCH] Rust 1.79 tranzystorekk
@ 2024-06-13 23:26 ` tranzystorekk
2024-06-21 19:22 ` [PR PATCH] [Merged]: " classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: tranzystorekk @ 2024-06-13 23:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/50822#issuecomment-2166947454
Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:
## New failures since 1.78
### Misc
- `hurl` https://0x0.st/Xc9-.txt cc @icp1994
- `vaultwarden` https://0x0.st/Xc9o.txt cc @TinfoilSubmarine
## Known failures
- `cargo-crev`
- `cargo-geiger`
- `fool`
- `gcsf`
- `gping` #49676
- `ion`
- `lapce`
- `spotifyd`
- `spotify-tui`
- `wasmtime`
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Rust 1.79
2024-06-13 23:21 [PR PATCH] Rust 1.79 tranzystorekk
2024-06-13 23:26 ` tranzystorekk
@ 2024-06-21 19:22 ` classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2024-06-21 19:22 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.79
https://github.com/void-linux/void-packages/pull/50822
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] 3+ messages in thread
end of thread, other threads:[~2024-06-21 19:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-13 23:21 [PR PATCH] Rust 1.79 tranzystorekk
2024-06-13 23:26 ` tranzystorekk
2024-06-21 19:22 ` [PR PATCH] [Merged]: " classabbyamp
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).