[PR PATCH] [WIP] Rust 1.73

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] [WIP] Rust 1.73
@ 2023-10-06  6:50 tranzystorek-io
  2023-10-06  6:55 ` tranzystorek-io
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: tranzystorek-io @ 2023-10-06  6:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]

There is a new pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages rust
https://github.com/void-linux/void-packages/pull/46474

[WIP] Rust 1.73
- rust-bootstrap: update to 1.73.0
- cargo-bootstrap: update to 1.73.0
- rust: update to 1.73.0
- cargo: update to 1.73.0

<!-- 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/46474.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-46474.patch --]
[-- Type: text/x-diff, Size: 15362 bytes --]

From 657bf728caf5239e72ceed5895c905af5d8d0648 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 00:37:43 +0200
Subject: [PATCH 1/4] rust-bootstrap: update to 1.73.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 9ad15ff7c03dd..e0d3dc98c235f 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.72.1
+version=1.73.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="
-		 ea26398c11cb97905ee167875dfe21f03f71ba38e7ee1da449c5d2b2b9c6c829
-		 dd3df561854dda237a961852104905819dc5e858f72f1d9105ac1a4c1f493f40"
+		 3d98a27c50ae79de7c7956506d649e169312e76b4fc2314a975b45ebd1dea5b9
+		 c46936bf3c921c90593b6ea77a08b1ec8b240c8184b287fd89fea636ac437b25"
 		;;
 	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="
-		 df30342d3cc16c9688b6121301397489f2f07c2c8cbd074c74857cc70e61281b
-		 35d7f3099c801fc0899453318a538ec55b9a4641279943479912d7784236338b"
+		 14f383eb4d6e65ce01cc99f2c5cf5a78744239f29704f72fe84f11095af779f5
+		 96efb163a57b400152c357be0ea3a0dd902b56cc0df662b9ac951403c7c7b15b"
 		;;
 	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="
-		 aa54389cd1b4a005987d3cbbcff0be89a09125803bd36c4fe0c4bb77e4a9272a
-		 b0a5ad5cd5b3e16bf2a627e4f282ad02a2d05c83eb9f2c22bc63dca4f7ca569e"
+		 e885398a10f5f4697dfb2b4e399bf9a0805ee8c11b9f9365ba4d803fef34d779
+		 c89f5164edffbda4a21212c1e74260021634bda43fbe6d5e4fe9f7e85a79320c"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 30a572253a5421df6b3dce492e3cfe41e007ddda Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 00:38:07 +0200
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.73.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 71c21ae221a58..8dfbfda30a9e0 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.72.1
+version=1.73.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="4ab6165d56aca05a90681ccd2aab77c746b700e3fe76b093257294d2fede429d"
+		checksum="8780f10eb3565b47f2616ccc1616c1a491a12a055976a25de551cb29e7f50390"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="64eb3dbc8aa1c2ee2e5f12cb4fd0a714219ffec9f503f7bbaac4c92d68017ad7"
+		checksum="7c3ce5738d570eaea97dd3d213ea73c8beda4f0c61e7486f95e497b7b10c4e2d"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="bb0df4909017dd2a144025c092710872aaf3db78cb01bb58bbeeb3269d4b6ce7"
+		checksum="7e17d4e03d5a949e73d02866589e2010e8a070e025ead08a2030d8d8dc002054"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 4d238219e62aa014bfe671326cc3417c2beb7607 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 00:38:43 +0200
Subject: [PATCH 3/4] rust: update to 1.73.0

---
 ...dlib-and-musl_root-from-musl-targets.patch | 50 +++++++++----------
 ...4-fix-shebang-on-install-template.sh.patch |  4 +-
 srcpkgs/rust/template                         |  4 +-
 3 files changed, 29 insertions(+), 29 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 06620bb8a4322..093afb15cbab3 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
@@ -60,10 +60,10 @@ index 61553e71b..88f807a58 100644
      base
  }
 diff --git a/config.example.toml b/config.example.toml
-index 0c65b25fe..3030f1a92 100644
+index 5c4bee875..bccf81b0a 100644
 --- a/config.example.toml
 +++ b/config.example.toml
-@@ -563,14 +563,6 @@ changelog-seen = 2
+@@ -573,14 +573,6 @@ changelog-seen = 2
  # behavior -- this may lead to miscompilations or other bugs.
  #description = ""
  
@@ -79,7 +79,7 @@ index 0c65b25fe..3030f1a92 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/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index ade3bfed1..66d2f549a 100644
+index 2496c2a9d..9aff56181 100644
 --- a/src/bootstrap/cc_detect.rs
 +++ b/src/bootstrap/cc_detect.rs
 @@ -110,7 +110,7 @@ pub fn find_target(build: &Build, target: TargetSelection) {
@@ -136,10 +136,10 @@ index ade3bfed1..66d2f549a 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 14c3ef79a..c525031d1 100644
+index 9c68e5a78..09fb6a721 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -268,39 +268,7 @@ fn copy_self_contained_objects(
+@@ -256,39 +256,7 @@ fn copy_self_contained_objects(
      let mut target_deps = vec![];
  
      // Copies the libc and CRT objects.
@@ -149,7 +149,7 @@ index 14c3ef79a..c525031d1 100644
 -    // to using gcc from a glibc-targeting toolchain for linking.
 -    // To do that we have to distribute musl startup objects as a part of Rust toolchain
 -    // and link with them manually in the self-contained mode.
--    if target.contains("musl") {
+-    if target.contains("musl") && !target.contains("unikraft") {
 -        let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
 -            panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
 -        });
@@ -175,12 +175,12 @@ index 14c3ef79a..c525031d1 100644
 -            let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
 -            target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
 -        }
--    } else if target.ends_with("-wasi") {
-+    if target.ends_with("-wasi") {
+-    } else if target.contains("-wasi") {
++    if target.contains("-wasi") {
          let srcdir = builder
              .wasi_root(target)
              .unwrap_or_else(|| {
-@@ -397,15 +365,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -390,15 +358,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
              .arg("--manifest-path")
              .arg(builder.src.join("library/sysroot/Cargo.toml"));
  
@@ -193,14 +193,14 @@ index 14c3ef79a..c525031d1 100644
 -            }
 -        }
 -
-         if target.ends_with("-wasi") {
+         if target.contains("-wasi") {
              if let Some(p) = builder.wasi_root(target) {
-                 let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap());
+                 let root = format!(
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index fe932fd6b..937801cea 100644
+index 4821d20a8..b9743ce8b 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -263,7 +263,6 @@ pub struct Config {
+@@ -264,7 +264,6 @@ pub struct Config {
      pub missing_tools: bool,
  
      // Fallback musl-root for all targets
@@ -208,8 +208,8 @@ index fe932fd6b..937801cea 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -536,8 +535,6 @@ pub struct Target {
-     pub profiler: Option<bool>,
+@@ -537,8 +536,6 @@ pub struct Target {
+     pub profiler: Option<StringOrBool>,
      pub rpath: Option<bool>,
      pub crt_static: Option<bool>,
 -    pub musl_root: Option<PathBuf>,
@@ -217,7 +217,7 @@ index fe932fd6b..937801cea 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-@@ -945,7 +942,6 @@ define_config! {
+@@ -998,7 +995,6 @@ define_config! {
          default_linker: Option<String> = "default-linker",
          channel: Option<String> = "channel",
          description: Option<String> = "description",
@@ -225,8 +225,8 @@ index fe932fd6b..937801cea 100644
          rpath: Option<bool> = "rpath",
          verbose_tests: Option<bool> = "verbose-tests",
          optimize_tests: Option<bool> = "optimize-tests",
-@@ -994,8 +990,6 @@ define_config! {
-         profiler: Option<bool> = "profiler",
+@@ -1047,8 +1043,6 @@ define_config! {
+         profiler: Option<StringOrBool> = "profiler",
          rpath: Option<bool> = "rpath",
          crt_static: Option<bool> = "crt-static",
 -        musl_root: Option<String> = "musl-root",
@@ -234,7 +234,7 @@ index fe932fd6b..937801cea 100644
          wasi_root: Option<String> = "wasi-root",
          qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-@@ -1367,7 +1361,6 @@ impl Config {
+@@ -1430,7 +1424,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 fe932fd6b..937801cea 100644
              config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
              set(
                  &mut config.deny_warnings,
-@@ -1534,8 +1527,6 @@ impl Config {
+@@ -1615,8 +1608,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.map(PathBuf::from);
                  target.linker = cfg.linker.map(PathBuf::from);
                  target.crt_static = cfg.crt_static;
@@ -252,7 +252,7 @@ index fe932fd6b..937801cea 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 e8eebdfb5..8e1b4ec98 100755
+index 15e8c1eb9..7749fc54d 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",
@@ -291,10 +291,10 @@ index e8eebdfb5..8e1b4ec98 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 0a7aff622..8f06a1b51 100644
+index 4396bbc51..683ba5480 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -1256,25 +1256,6 @@ impl Build {
+@@ -1289,25 +1289,6 @@ impl Build {
          }
      }
  
@@ -321,7 +321,7 @@ index 0a7aff622..8f06a1b51 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 8f5ba4273..73192fef2 100644
+index 7e83b508e..761e83ddc 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
 @@ -11,7 +11,6 @@
@@ -337,7 +337,7 @@ index 8f5ba4273..73192fef2 100644
          }
  
 -        // Make sure musl-root is valid
--        if target.contains("musl") {
+-        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
 -            if build.musl_root(*target).is_none() && build.config.build == *target {
diff --git a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
index 2326d3cc4232e..dcf4ed953a887 100644
--- a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
+++ b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
@@ -4,11 +4,11 @@ Date: Mon, 20 Dec 2021 00:55:18 +0100
 Subject: [PATCH 04/15] fix shebang on install-template.sh
 
 diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh
-index 92a3f1f2c..fca281191 100644
+index b477c3eac..7bf7ed7fb 100644
 --- a/src/tools/rust-installer/install-template.sh
 +++ b/src/tools/rust-installer/install-template.sh
 @@ -1,4 +1,4 @@
--#!/bin/bash
+-#!/usr/bin/env bash
 +#!/bin/sh
  
  # No undefined variables
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 708e04edbc7bb..7f560e029a2a6 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.72.1
+version=1.73.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=7f48845f6a52cdbb5d63fb0528fd5f520eb443275b55f98e328159f86568f895
+checksum=96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a
 lib32disabled=yes
 make_check=no # CBA for now
 python_version=3 # needed for python files in rust-src

From 11b95f2ad30ff02447a65ad39c494793f083d8dc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 02:13:02 +0200
Subject: [PATCH 4/4] cargo: update to 1.73.0

---
 srcpkgs/cargo/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index d5213857e7e92..db3b2b51bab50 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.72.0
+version=1.73.0
 revision=1
-_cargo_revision=0.73.1
+_cargo_revision=0.74.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
 makedepends="rust libcurl-devel openssl-devel"
@@ -11,8 +11,8 @@ short_desc="Rust package manager"
 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=976fb6f3e773319e60875772478645297d9eacc852857e288e8cec65399d2c88
+distfiles="https://github.com/rust-lang/cargo/archive/9c4383fb55986096b414d98125421ab87b5fd642.tar.gz"
+checksum=f3a6394359882e68ee2bf733f349471ea88c54d8e3f769e2ef431b7cf315cfb1
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [WIP] Rust 1.73
  2023-10-06  6:50 [PR PATCH] [WIP] Rust 1.73 tranzystorek-io
@ 2023-10-06  6:55 ` tranzystorek-io
  2023-10-10  7:21 ` [PR PATCH] [Updated] " tranzystorek-io
  2023-10-19  9:05 ` [PR PATCH] [Merged]: " classabbyamp
  2 siblings, 0 replies; 4+ messages in thread
From: tranzystorek-io @ 2023-10-06  6:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/46474#issuecomment-1750077499

Comment:
Results of `build_style=cargo` rebuild on x86_64:

## New failures

- cargo-crev: http://0x0.st/HWxf.txt cc @jcgruenhage
- ion: http://0x0.st/HWxV.txt cc @konimex

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] Rust 1.73
  2023-10-06  6:50 [PR PATCH] [WIP] Rust 1.73 tranzystorek-io
  2023-10-06  6:55 ` tranzystorek-io
@ 2023-10-10  7:21 ` tranzystorek-io
  2023-10-19  9:05 ` [PR PATCH] [Merged]: " classabbyamp
  2 siblings, 0 replies; 4+ messages in thread
From: tranzystorek-io @ 2023-10-10  7:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages rust
https://github.com/void-linux/void-packages/pull/46474

[WIP] Rust 1.73
- rust-bootstrap: update to 1.73.0
- cargo-bootstrap: update to 1.73.0
- rust: update to 1.73.0
- cargo: update to 1.73.0

<!-- 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/46474.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-46474.patch --]
[-- Type: text/x-diff, Size: 15221 bytes --]

From 8f606aaa2887534e79f828770b79e87483950dd5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 00:37:43 +0200
Subject: [PATCH 1/4] rust-bootstrap: update to 1.73.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 9ad15ff7c03dd..e0d3dc98c235f 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.72.1
+version=1.73.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="
-		 ea26398c11cb97905ee167875dfe21f03f71ba38e7ee1da449c5d2b2b9c6c829
-		 dd3df561854dda237a961852104905819dc5e858f72f1d9105ac1a4c1f493f40"
+		 3d98a27c50ae79de7c7956506d649e169312e76b4fc2314a975b45ebd1dea5b9
+		 c46936bf3c921c90593b6ea77a08b1ec8b240c8184b287fd89fea636ac437b25"
 		;;
 	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="
-		 df30342d3cc16c9688b6121301397489f2f07c2c8cbd074c74857cc70e61281b
-		 35d7f3099c801fc0899453318a538ec55b9a4641279943479912d7784236338b"
+		 14f383eb4d6e65ce01cc99f2c5cf5a78744239f29704f72fe84f11095af779f5
+		 96efb163a57b400152c357be0ea3a0dd902b56cc0df662b9ac951403c7c7b15b"
 		;;
 	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="
-		 aa54389cd1b4a005987d3cbbcff0be89a09125803bd36c4fe0c4bb77e4a9272a
-		 b0a5ad5cd5b3e16bf2a627e4f282ad02a2d05c83eb9f2c22bc63dca4f7ca569e"
+		 e885398a10f5f4697dfb2b4e399bf9a0805ee8c11b9f9365ba4d803fef34d779
+		 c89f5164edffbda4a21212c1e74260021634bda43fbe6d5e4fe9f7e85a79320c"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 1a87ccd2f138b467e4430d6fcfa17ada9763714d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 00:38:07 +0200
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.73.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 71c21ae221a58..8dfbfda30a9e0 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.72.1
+version=1.73.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="4ab6165d56aca05a90681ccd2aab77c746b700e3fe76b093257294d2fede429d"
+		checksum="8780f10eb3565b47f2616ccc1616c1a491a12a055976a25de551cb29e7f50390"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="64eb3dbc8aa1c2ee2e5f12cb4fd0a714219ffec9f503f7bbaac4c92d68017ad7"
+		checksum="7c3ce5738d570eaea97dd3d213ea73c8beda4f0c61e7486f95e497b7b10c4e2d"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="bb0df4909017dd2a144025c092710872aaf3db78cb01bb58bbeeb3269d4b6ce7"
+		checksum="7e17d4e03d5a949e73d02866589e2010e8a070e025ead08a2030d8d8dc002054"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From f67a6a15817ff862a9744d56302e222389e7e3c8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 00:38:43 +0200
Subject: [PATCH 3/4] rust: update to 1.73.0

---
 ...dlib-and-musl_root-from-musl-targets.patch | 50 +++++++++----------
 ...4-fix-shebang-on-install-template.sh.patch |  4 +-
 srcpkgs/rust/template                         |  4 +-
 3 files changed, 29 insertions(+), 29 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 06620bb8a4322..093afb15cbab3 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
@@ -60,10 +60,10 @@ index 61553e71b..88f807a58 100644
      base
  }
 diff --git a/config.example.toml b/config.example.toml
-index 0c65b25fe..3030f1a92 100644
+index 5c4bee875..bccf81b0a 100644
 --- a/config.example.toml
 +++ b/config.example.toml
-@@ -563,14 +563,6 @@ changelog-seen = 2
+@@ -573,14 +573,6 @@ changelog-seen = 2
  # behavior -- this may lead to miscompilations or other bugs.
  #description = ""
  
@@ -79,7 +79,7 @@ index 0c65b25fe..3030f1a92 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/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index ade3bfed1..66d2f549a 100644
+index 2496c2a9d..9aff56181 100644
 --- a/src/bootstrap/cc_detect.rs
 +++ b/src/bootstrap/cc_detect.rs
 @@ -110,7 +110,7 @@ pub fn find_target(build: &Build, target: TargetSelection) {
@@ -136,10 +136,10 @@ index ade3bfed1..66d2f549a 100644
      }
  }
 diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 14c3ef79a..c525031d1 100644
+index 9c68e5a78..09fb6a721 100644
 --- a/src/bootstrap/compile.rs
 +++ b/src/bootstrap/compile.rs
-@@ -268,39 +268,7 @@ fn copy_self_contained_objects(
+@@ -256,39 +256,7 @@ fn copy_self_contained_objects(
      let mut target_deps = vec![];
  
      // Copies the libc and CRT objects.
@@ -149,7 +149,7 @@ index 14c3ef79a..c525031d1 100644
 -    // to using gcc from a glibc-targeting toolchain for linking.
 -    // To do that we have to distribute musl startup objects as a part of Rust toolchain
 -    // and link with them manually in the self-contained mode.
--    if target.contains("musl") {
+-    if target.contains("musl") && !target.contains("unikraft") {
 -        let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
 -            panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
 -        });
@@ -175,12 +175,12 @@ index 14c3ef79a..c525031d1 100644
 -            let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
 -            target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
 -        }
--    } else if target.ends_with("-wasi") {
-+    if target.ends_with("-wasi") {
+-    } else if target.contains("-wasi") {
++    if target.contains("-wasi") {
          let srcdir = builder
              .wasi_root(target)
              .unwrap_or_else(|| {
-@@ -397,15 +365,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -390,15 +358,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
              .arg("--manifest-path")
              .arg(builder.src.join("library/sysroot/Cargo.toml"));
  
@@ -193,14 +193,14 @@ index 14c3ef79a..c525031d1 100644
 -            }
 -        }
 -
-         if target.ends_with("-wasi") {
+         if target.contains("-wasi") {
              if let Some(p) = builder.wasi_root(target) {
-                 let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap());
+                 let root = format!(
 diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index fe932fd6b..937801cea 100644
+index 4821d20a8..b9743ce8b 100644
 --- a/src/bootstrap/config.rs
 +++ b/src/bootstrap/config.rs
-@@ -263,7 +263,6 @@ pub struct Config {
+@@ -264,7 +264,6 @@ pub struct Config {
      pub missing_tools: bool,
  
      // Fallback musl-root for all targets
@@ -208,8 +208,8 @@ index fe932fd6b..937801cea 100644
      pub prefix: Option<PathBuf>,
      pub sysconfdir: Option<PathBuf>,
      pub datadir: Option<PathBuf>,
-@@ -536,8 +535,6 @@ pub struct Target {
-     pub profiler: Option<bool>,
+@@ -537,8 +536,6 @@ pub struct Target {
+     pub profiler: Option<StringOrBool>,
      pub rpath: Option<bool>,
      pub crt_static: Option<bool>,
 -    pub musl_root: Option<PathBuf>,
@@ -217,7 +217,7 @@ index fe932fd6b..937801cea 100644
      pub wasi_root: Option<PathBuf>,
      pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-@@ -945,7 +942,6 @@ define_config! {
+@@ -998,7 +995,6 @@ define_config! {
          default_linker: Option<String> = "default-linker",
          channel: Option<String> = "channel",
          description: Option<String> = "description",
@@ -225,8 +225,8 @@ index fe932fd6b..937801cea 100644
          rpath: Option<bool> = "rpath",
          verbose_tests: Option<bool> = "verbose-tests",
          optimize_tests: Option<bool> = "optimize-tests",
-@@ -994,8 +990,6 @@ define_config! {
-         profiler: Option<bool> = "profiler",
+@@ -1047,8 +1043,6 @@ define_config! {
+         profiler: Option<StringOrBool> = "profiler",
          rpath: Option<bool> = "rpath",
          crt_static: Option<bool> = "crt-static",
 -        musl_root: Option<String> = "musl-root",
@@ -234,7 +234,7 @@ index fe932fd6b..937801cea 100644
          wasi_root: Option<String> = "wasi-root",
          qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-@@ -1367,7 +1361,6 @@ impl Config {
+@@ -1430,7 +1424,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 fe932fd6b..937801cea 100644
              config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
              set(
                  &mut config.deny_warnings,
-@@ -1534,8 +1527,6 @@ impl Config {
+@@ -1615,8 +1608,6 @@ impl Config {
                  target.ranlib = cfg.ranlib.map(PathBuf::from);
                  target.linker = cfg.linker.map(PathBuf::from);
                  target.crt_static = cfg.crt_static;
@@ -252,7 +252,7 @@ index fe932fd6b..937801cea 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 e8eebdfb5..8e1b4ec98 100755
+index 15e8c1eb9..7749fc54d 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",
@@ -291,10 +291,10 @@ index e8eebdfb5..8e1b4ec98 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 0a7aff622..8f06a1b51 100644
+index 4396bbc51..683ba5480 100644
 --- a/src/bootstrap/lib.rs
 +++ b/src/bootstrap/lib.rs
-@@ -1256,25 +1256,6 @@ impl Build {
+@@ -1289,25 +1289,6 @@ impl Build {
          }
      }
  
@@ -321,7 +321,7 @@ index 0a7aff622..8f06a1b51 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 8f5ba4273..73192fef2 100644
+index 7e83b508e..761e83ddc 100644
 --- a/src/bootstrap/sanity.rs
 +++ b/src/bootstrap/sanity.rs
 @@ -11,7 +11,6 @@
@@ -337,7 +337,7 @@ index 8f5ba4273..73192fef2 100644
          }
  
 -        // Make sure musl-root is valid
--        if target.contains("musl") {
+-        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
 -            if build.musl_root(*target).is_none() && build.config.build == *target {
diff --git a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
index 2326d3cc4232e..dcf4ed953a887 100644
--- a/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
+++ b/srcpkgs/rust/patches/0004-fix-shebang-on-install-template.sh.patch
@@ -4,11 +4,11 @@ Date: Mon, 20 Dec 2021 00:55:18 +0100
 Subject: [PATCH 04/15] fix shebang on install-template.sh
 
 diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh
-index 92a3f1f2c..fca281191 100644
+index b477c3eac..7bf7ed7fb 100644
 --- a/src/tools/rust-installer/install-template.sh
 +++ b/src/tools/rust-installer/install-template.sh
 @@ -1,4 +1,4 @@
--#!/bin/bash
+-#!/usr/bin/env bash
 +#!/bin/sh
  
  # No undefined variables
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 708e04edbc7bb..7f560e029a2a6 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.72.1
+version=1.73.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=7f48845f6a52cdbb5d63fb0528fd5f520eb443275b55f98e328159f86568f895
+checksum=96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a
 lib32disabled=yes
 make_check=no # CBA for now
 python_version=3 # needed for python files in rust-src

From dec03173d255e1e6d706a55cc39deb84843766d2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Oct 2023 02:13:02 +0200
Subject: [PATCH 4/4] cargo: update to 1.73.0

---
 srcpkgs/cargo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index d5213857e7e92..315a204429f5e 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.72.0
+version=1.73.0
 revision=1
-_cargo_revision=0.73.1
+_cargo_revision=0.74.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=976fb6f3e773319e60875772478645297d9eacc852857e288e8cec65399d2c88
+checksum=a7ed5ec806f2b334f194380584e17538cc173ef18ec3fba4d7967dc5c1bd7565
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Merged]: Rust 1.73
  2023-10-06  6:50 [PR PATCH] [WIP] Rust 1.73 tranzystorek-io
  2023-10-06  6:55 ` tranzystorek-io
  2023-10-10  7:21 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2023-10-19  9:05 ` classabbyamp
  2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-10-19  9:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1198 bytes --]

There's a merged pull request on the void-packages repository

Rust 1.73
https://github.com/void-linux/void-packages/pull/46474

Description:
- rust-bootstrap: update to 1.73.0
- cargo-bootstrap: update to 1.73.0
- rust: update to 1.73.0
- cargo: update to 1.73.0

<!-- 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:[~2023-10-19  9:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06  6:50 [PR PATCH] [WIP] Rust 1.73 tranzystorek-io
2023-10-06  6:55 ` tranzystorek-io
2023-10-10  7:21 ` [PR PATCH] [Updated] " tranzystorek-io
2023-10-19  9:05 ` [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).