Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] Rust 1.77
@ 2024-03-21 18:42 tranzystorekk
  2024-03-30 12:37 ` [PR PATCH] [Updated] " tranzystorekk
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: tranzystorekk @ 2024-03-21 18:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1654 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/49437

[WIP] Rust 1.77
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (cargo fails to build)

Cargo 1.77 started using features from git2 0.18 that we currently patch back to 0.17 to accommodate libgit2 1.6:
https://github.com/rust-lang/cargo/blob/3fe68eabf93cbf3772bbcad09a9206c783e2de3f/src/cargo/sources/git/utils.rs#L1108-L1110

The simplest way forward is probably to stop downgrading git2, but that requires merging https://github.com/void-linux/void-packages/pull/45976 first.

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

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

From f997343d8bd3a79acf630a921b434a20882c8dec Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:28:12 +0100
Subject: [PATCH 1/4] rust-bootstrap: update to 1.77.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 6a192e750e59fc..5b95ded72b32b0 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.76.0
+version=1.77.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="
-		 e52ff92c605284b049e88912343a0f1c9c4cef7cc4a501d4e8f1ab9e4d9b1d7e
-		 78fb0859beb4f18af7227af3f09f0218169ca38c7751865e40d78d697ca190fc"
+		 1d15d1558d1c97072c1ecfac9f4466022c4afa482e06efdb5cf4eeebe940a186
+		 332b4652fc5f37379ff8f820a6affea6500350d0669f72cf4fdec9b8900d66ea"
 		;;
 	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="
-		 9fadfcf71bc6a0ddfd026b9624163faf1c5689dd4a1f7cc1f857167ade4aa6eb
-		 e41150b52d923a3bbe166c4ecc5719f56576274b0d034d764768aee279ae2063"
+		 89397dddb99733bad987e9fdc9d985a150af2e39c81766099e584d93991f5752
+		 e5fec840744c3ff63611f6801de80f5ec8e099fa8225bf46d064810a9545e9b5"
 		;;
 	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="
-		 3669762d7ee90d06bc3b532e15fc29e7918b40b85c93ea314b98d6cad18f435b
-		 995bda2aeff09ecbda9a1892a6c47beb087e99c9be924dc8fa6416f6813f4edc"
+		 9585d3ff70780e058b0aebaa88ede511d84e3bacfcfcde6e44747bac408f3bb4
+		 527be757a020e1f48b717b6573c8de83e6a51880709818e195cbf2f916e47ce7"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 918151a782aa702370e61a99e99d33e61cc43e3d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:29:00 +0100
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.77.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 0afa19d2e23de2..2182e646106d6f 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.76.0
+version=1.77.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="ffa9b2b65a3bd6298ffd5a2defd6ac5fa42d1a0dcefdea50b92ddf8d162db19c"
+		checksum="eaf3461608760821fdf0beca8f68eaa743fc9a7fcc1725bfb143e57b815d123e"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="30ec0ad9fca443ec12c544f9ce448dacdde411a45b9042961938b650e918ccfb"
+		checksum="0af971f126e0307d4e4d974f0e9c33fd1c2923274b14a0861823b5a019e8faf5"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="b18032e92bbd69a9ed9036393a3d5168d3071e2d47c74cb9e2fe1737b7d106b6"
+		checksum="947d0e28e7aa08269cf0ec16b4f405969ff503159f5e3f24375686a09c174531"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 01712de56301528c4d04d799c6a473a8b41635f9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:30:09 +0100
Subject: [PATCH 3/4] rust: update to 1.77.0

---
 ...-of-need-ssp_nonshared.patch-from-al.patch | 22 +++++++++----------
 srcpkgs/rust/template                         |  7 +++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
index ec26d9c26ae085..df82caa9dd6add 100644
--- a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
+++ b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
@@ -5,24 +5,24 @@ Subject: [PATCH 14/15] copy new version of need-ssp_nonshared.patch from
  alpine
 
 ---
- library/std/src/sys/unix/mod.rs | 4 ++++
+ library/std/src/sys/pal/unix/mod.rs | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs
-index 34a023b02..934a87570 100644
---- a/library/std/src/sys/unix/mod.rs
-+++ b/library/std/src/sys/unix/mod.rs
-@@ -297,6 +297,10 @@ cfg_if::cfg_if! {
-         #[link(name = "dl")]
-         #[link(name = "log")]
+diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs
+index 43cb9d89b..4158c79da 100644
+--- a/library/std/src/sys/pal/unix/mod.rs
++++ b/library/std/src/sys/pal/unix/mod.rs
+@@ -379,6 +379,10 @@ cfg_if::cfg_if! {
+         #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
+         #[link(name = "log", cfg(not(target_feature = "crt-static")))]
          extern "C" {}
 +    } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
-+	    #[link(name = "ssp_nonshared")]
++        #[link(name = "ssp_nonshared")]
 +        #[link(name = "execinfo")]
-+	    extern "C" {}
++        extern "C" {}
      } else if #[cfg(target_os = "freebsd")] {
          #[link(name = "execinfo")]
          #[link(name = "pthread")]
 -- 
-2.37.2
+2.44.0
 
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index b93271e97ded86..78e8b7c41a3410 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,8 +8,8 @@
 # uploaded to https://repo-default.voidlinux.org/distfiles/
 #
 pkgname=rust
-version=1.76.0
-revision=2
+version=1.77.0
+revision=1
 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
 makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-devel"
 depends="rust-std gcc"
@@ -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=9e5cff033a7f0d2266818982ad90e4d3e4ef8f8ee1715776c6e25073a136c021
+checksum=0d6ccd1fa845fe3456b9ed4d483fc06acf9bbae9417e396b5144488c1a522d87
 lib32disabled=yes
 make_check=no # CBA for now
 python_version=3 # needed for python files in rust-src
@@ -139,6 +139,7 @@ do_configure() {
 		--set="build.submodules=false" \
 		--set="build.rustc=/usr/bin/rustc" \
 		--set="build.cargo=/usr/bin/cargo" \
+		--set="build.optimized-compiler-builtins=false" \
 		--set="target.${RUST_BUILD}.crt-static=false" \
 		--set="target.${RUST_BUILD}.cc=${CC_host:-$CC}" \
 		--set="target.${RUST_BUILD}.cxx=${CXX_host:-$CXX}" \

From 9aa9ff5171c63cb4c94b36d9a67c0040bee32d8e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:31:12 +0100
Subject: [PATCH 4/4] cargo: update to 1.77.0

---
 srcpkgs/cargo/patches/downgrade-git2.patch | 38 +++++++++++-----------
 srcpkgs/cargo/template                     |  6 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
index c35a90d0ce555b..28b505cf78f606 100644
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ b/srcpkgs/cargo/patches/downgrade-git2.patch
@@ -1,15 +1,15 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
+index d70a6b4..df78ed0 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
+@@ -1037,11 +1037,11 @@ dependencies = [
  
  [[package]]
  name = "git2"
--version = "0.18.1"
+-version = "0.18.2"
 +version = "0.17.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
+-checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd"
 +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
  dependencies = [
 - "bitflags 2.4.1",
@@ -17,7 +17,7 @@ index 36cf880..72aca65 100644
   "libc",
   "libgit2-sys",
   "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
+@@ -1052,9 +1052,9 @@ dependencies = [
  
  [[package]]
  name = "git2-curl"
@@ -29,39 +29,39 @@ index 36cf880..72aca65 100644
  dependencies = [
   "curl",
   "git2",
-@@ -2065,9 +2065,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+@@ -2066,9 +2066,9 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
  
  [[package]]
  name = "libgit2-sys"
--version = "0.16.1+1.7.1"
+-version = "0.16.2+1.7.2"
 +version = "0.15.2+1.6.4"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
+-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
 +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
  dependencies = [
   "cc",
   "libc",
 diff --git a/Cargo.toml b/Cargo.toml
-index c07b004..68c45a0 100644
+index 1d7cc85..a58c294 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
+@@ -44,8 +44,8 @@ curl = "0.4.44"
  curl-sys = "0.4.70"
- filetime = "0.2.22"
+ filetime = "0.2.23"
  flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
+-git2 = "0.18.2"
 -git2-curl = "0.19.0"
 +git2 = "0.17.2"
 +git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
+ gix = { version = "0.57.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
+ gix-features-for-configuration-only = { version = "0.37.1", package = "gix-features", features = [ "parallel" ] }
  glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
+@@ -62,7 +62,7 @@ itertools = "0.12.0"
+ jobserver = "0.1.28"
  lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
+ libc = "0.2.151"
+-libgit2-sys = "0.16.2"
 +libgit2-sys = "0.15.2"
  libloading = "0.8.1"
- memchr = "2.6.4"
+ memchr = "2.7.1"
  miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..a6fb3fa68e75e3 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.76.0
+version=1.77.0
 revision=1
-_cargo_revision=0.77.0
+_cargo_revision=0.78.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=1c33e2feb197f848f082fdc074162328e231c2f68394e0e1d2dbbbf79c9fc3ec
+checksum=9adbcd40704720174f529168cff26d3b6f74d85c152a6a0c32a16e774f7672b3
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

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

* Re: [PR PATCH] [Updated] [WIP] Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
@ 2024-03-30 12:37 ` tranzystorekk
  2024-04-02 10:08 ` tranzystorekk
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-03-30 12:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1809 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/49437

[WIP] Rust 1.77
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (cargo fails to build)

Cargo 1.77 started using features from git2 0.18 that we currently patch back to 0.17 to accommodate libgit2 1.6:
https://github.com/rust-lang/cargo/blob/3fe68eabf93cbf3772bbcad09a9206c783e2de3f/src/cargo/sources/git/utils.rs#L1108-L1110

The simplest way forward is probably to stop downgrading git2, but that requires merging https://github.com/void-linux/void-packages/pull/45976 first.

Also had to manually disable optimized-compiler-builtins as they are incorrectly enabled by default: https://github.com/rust-lang/rust/pull/119556

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

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

From ee5388a081914e5b149926d0142de630dbebd870 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:28:12 +0100
Subject: [PATCH 1/4] rust-bootstrap: update to 1.77.1

---
 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 6a192e750e59fc..afc36b5253251e 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.76.0
+version=1.77.1
 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="
-		 e52ff92c605284b049e88912343a0f1c9c4cef7cc4a501d4e8f1ab9e4d9b1d7e
-		 78fb0859beb4f18af7227af3f09f0218169ca38c7751865e40d78d697ca190fc"
+		 204a79ddc33e74a23b817724a57fdaad5e2552d034653915a7508c7d0063045a
+		 7bf24ca93bde8cd761128e68cbcabc9d304c5cf19fcdd020bca2d56e43014381"
 		;;
 	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="
-		 9fadfcf71bc6a0ddfd026b9624163faf1c5689dd4a1f7cc1f857167ade4aa6eb
-		 e41150b52d923a3bbe166c4ecc5719f56576274b0d034d764768aee279ae2063"
+		 c9caaf8c214f6683281fa55e76a4d345004aa2933daca469952b3bead8cc5ca9
+		 317e604909360d1bb92f7558aaa5ce449312630d8226767ae9df99bf5bef4fd1"
 		;;
 	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="
-		 3669762d7ee90d06bc3b532e15fc29e7918b40b85c93ea314b98d6cad18f435b
-		 995bda2aeff09ecbda9a1892a6c47beb087e99c9be924dc8fa6416f6813f4edc"
+		 d00be127d978177c0b2f439a1e63e4c25a3ca5f035a7282187555ab540cc18a3
+		 899c2668e65ad3557033169e67a6fa3d9c816c62d39ee11d5ebef4eded226d0b"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From a65ca2c98870c863d8f07c71bff924a8c62ef178 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:29:00 +0100
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.77.1

---
 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 0afa19d2e23de2..8a97b963bd76c2 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.76.0
+version=1.77.1
 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="ffa9b2b65a3bd6298ffd5a2defd6ac5fa42d1a0dcefdea50b92ddf8d162db19c"
+		checksum="3fe49c81296a64c51b69ddbeecbdf12e12e41eb9ca636e75b4bc372ae09858ee"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="30ec0ad9fca443ec12c544f9ce448dacdde411a45b9042961938b650e918ccfb"
+		checksum="87713287303cbb44d89d839ade3de7fe679fcadfe4688a9c6829c276a7946e79"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="b18032e92bbd69a9ed9036393a3d5168d3071e2d47c74cb9e2fe1737b7d106b6"
+		checksum="d5ff9700b75c908ba0a1048386d0151414ad161da01d640c850b1955695b175f"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 2bac6e4a02e1065d8c88b0f8e05c21431fc807da Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:30:09 +0100
Subject: [PATCH 3/4] rust: update to 1.77.1

---
 ...-of-need-ssp_nonshared.patch-from-al.patch | 22 +++++++++----------
 srcpkgs/rust/template                         |  7 +++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
index ec26d9c26ae085..df82caa9dd6add 100644
--- a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
+++ b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
@@ -5,24 +5,24 @@ Subject: [PATCH 14/15] copy new version of need-ssp_nonshared.patch from
  alpine
 
 ---
- library/std/src/sys/unix/mod.rs | 4 ++++
+ library/std/src/sys/pal/unix/mod.rs | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs
-index 34a023b02..934a87570 100644
---- a/library/std/src/sys/unix/mod.rs
-+++ b/library/std/src/sys/unix/mod.rs
-@@ -297,6 +297,10 @@ cfg_if::cfg_if! {
-         #[link(name = "dl")]
-         #[link(name = "log")]
+diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs
+index 43cb9d89b..4158c79da 100644
+--- a/library/std/src/sys/pal/unix/mod.rs
++++ b/library/std/src/sys/pal/unix/mod.rs
+@@ -379,6 +379,10 @@ cfg_if::cfg_if! {
+         #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
+         #[link(name = "log", cfg(not(target_feature = "crt-static")))]
          extern "C" {}
 +    } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
-+	    #[link(name = "ssp_nonshared")]
++        #[link(name = "ssp_nonshared")]
 +        #[link(name = "execinfo")]
-+	    extern "C" {}
++        extern "C" {}
      } else if #[cfg(target_os = "freebsd")] {
          #[link(name = "execinfo")]
          #[link(name = "pthread")]
 -- 
-2.37.2
+2.44.0
 
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index b93271e97ded86..21e11623638676 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,8 +8,8 @@
 # uploaded to https://repo-default.voidlinux.org/distfiles/
 #
 pkgname=rust
-version=1.76.0
-revision=2
+version=1.77.1
+revision=1
 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
 makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-devel"
 depends="rust-std gcc"
@@ -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=9e5cff033a7f0d2266818982ad90e4d3e4ef8f8ee1715776c6e25073a136c021
+checksum=ee106e4c569f52dba3b5b282b105820f86bd8f6b3d09c06b8dce82fb1bb3a4a1
 lib32disabled=yes
 make_check=no # CBA for now
 python_version=3 # needed for python files in rust-src
@@ -139,6 +139,7 @@ do_configure() {
 		--set="build.submodules=false" \
 		--set="build.rustc=/usr/bin/rustc" \
 		--set="build.cargo=/usr/bin/cargo" \
+		--set="build.optimized-compiler-builtins=false" \
 		--set="target.${RUST_BUILD}.crt-static=false" \
 		--set="target.${RUST_BUILD}.cc=${CC_host:-$CC}" \
 		--set="target.${RUST_BUILD}.cxx=${CXX_host:-$CXX}" \

From 30adb249082e697a064d1f2275bd20ee78340659 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:31:12 +0100
Subject: [PATCH 4/4] cargo: update to 1.77.1

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

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 71c35f0f1ccd6d..4d75e4a7306e12 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.76.0
-revision=2
-_cargo_revision=0.77.0
+version=1.77.1
+revision=1
+_cargo_revision=0.78.1
 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=1c33e2feb197f848f082fdc074162328e231c2f68394e0e1d2dbbbf79c9fc3ec
+checksum=0283fecebb6d3cbd111688eb0359edaf6676f4b2829201a8afe5a0e3afdb4b48
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

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

* Re: [PR PATCH] [Updated] [WIP] Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
  2024-03-30 12:37 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-04-02 10:08 ` tranzystorekk
  2024-04-02 10:28 ` tranzystorekk
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-04-02 10:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1809 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/49437

[WIP] Rust 1.77
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (cargo fails to build)

Cargo 1.77 started using features from git2 0.18 that we currently patch back to 0.17 to accommodate libgit2 1.6:
https://github.com/rust-lang/cargo/blob/3fe68eabf93cbf3772bbcad09a9206c783e2de3f/src/cargo/sources/git/utils.rs#L1108-L1110

The simplest way forward is probably to stop downgrading git2, but that requires merging https://github.com/void-linux/void-packages/pull/45976 first.

Also had to manually disable optimized-compiler-builtins as they are incorrectly enabled by default: https://github.com/rust-lang/rust/pull/119556

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

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

From 728617fc16799d89f7662c7fd783271c93c9bb40 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:28:12 +0100
Subject: [PATCH 1/4] rust-bootstrap: update to 1.77.1

---
 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 6a192e750e59fc..afc36b5253251e 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.76.0
+version=1.77.1
 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="
-		 e52ff92c605284b049e88912343a0f1c9c4cef7cc4a501d4e8f1ab9e4d9b1d7e
-		 78fb0859beb4f18af7227af3f09f0218169ca38c7751865e40d78d697ca190fc"
+		 204a79ddc33e74a23b817724a57fdaad5e2552d034653915a7508c7d0063045a
+		 7bf24ca93bde8cd761128e68cbcabc9d304c5cf19fcdd020bca2d56e43014381"
 		;;
 	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="
-		 9fadfcf71bc6a0ddfd026b9624163faf1c5689dd4a1f7cc1f857167ade4aa6eb
-		 e41150b52d923a3bbe166c4ecc5719f56576274b0d034d764768aee279ae2063"
+		 c9caaf8c214f6683281fa55e76a4d345004aa2933daca469952b3bead8cc5ca9
+		 317e604909360d1bb92f7558aaa5ce449312630d8226767ae9df99bf5bef4fd1"
 		;;
 	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="
-		 3669762d7ee90d06bc3b532e15fc29e7918b40b85c93ea314b98d6cad18f435b
-		 995bda2aeff09ecbda9a1892a6c47beb087e99c9be924dc8fa6416f6813f4edc"
+		 d00be127d978177c0b2f439a1e63e4c25a3ca5f035a7282187555ab540cc18a3
+		 899c2668e65ad3557033169e67a6fa3d9c816c62d39ee11d5ebef4eded226d0b"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From 697154c2f8abe968b690f4cea2ef52600c92472a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:29:00 +0100
Subject: [PATCH 2/4] cargo-bootstrap: update to 1.77.1

---
 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 0afa19d2e23de2..8a97b963bd76c2 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.76.0
+version=1.77.1
 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="ffa9b2b65a3bd6298ffd5a2defd6ac5fa42d1a0dcefdea50b92ddf8d162db19c"
+		checksum="3fe49c81296a64c51b69ddbeecbdf12e12e41eb9ca636e75b4bc372ae09858ee"
 		;;
 	x86_64)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
-		checksum="30ec0ad9fca443ec12c544f9ce448dacdde411a45b9042961938b650e918ccfb"
+		checksum="87713287303cbb44d89d839ade3de7fe679fcadfe4688a9c6829c276a7946e79"
 		;;
 	x86_64-musl)
 		distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
-		checksum="b18032e92bbd69a9ed9036393a3d5168d3071e2d47c74cb9e2fe1737b7d106b6"
+		checksum="d5ff9700b75c908ba0a1048386d0151414ad161da01d640c850b1955695b175f"
 		;;
 	# placeholders for user-supplied distfiles
 	ppc64le)

From c76a60d3105350a9baee61040b97ac8a4817be36 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:30:09 +0100
Subject: [PATCH 3/4] rust: update to 1.77.1

---
 ...-of-need-ssp_nonshared.patch-from-al.patch | 22 +++++++++----------
 srcpkgs/rust/template                         |  7 +++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
index ec26d9c26ae085..df82caa9dd6add 100644
--- a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
+++ b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
@@ -5,24 +5,24 @@ Subject: [PATCH 14/15] copy new version of need-ssp_nonshared.patch from
  alpine
 
 ---
- library/std/src/sys/unix/mod.rs | 4 ++++
+ library/std/src/sys/pal/unix/mod.rs | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs
-index 34a023b02..934a87570 100644
---- a/library/std/src/sys/unix/mod.rs
-+++ b/library/std/src/sys/unix/mod.rs
-@@ -297,6 +297,10 @@ cfg_if::cfg_if! {
-         #[link(name = "dl")]
-         #[link(name = "log")]
+diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs
+index 43cb9d89b..4158c79da 100644
+--- a/library/std/src/sys/pal/unix/mod.rs
++++ b/library/std/src/sys/pal/unix/mod.rs
+@@ -379,6 +379,10 @@ cfg_if::cfg_if! {
+         #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
+         #[link(name = "log", cfg(not(target_feature = "crt-static")))]
          extern "C" {}
 +    } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
-+	    #[link(name = "ssp_nonshared")]
++        #[link(name = "ssp_nonshared")]
 +        #[link(name = "execinfo")]
-+	    extern "C" {}
++        extern "C" {}
      } else if #[cfg(target_os = "freebsd")] {
          #[link(name = "execinfo")]
          #[link(name = "pthread")]
 -- 
-2.37.2
+2.44.0
 
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index b93271e97ded86..21e11623638676 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,8 +8,8 @@
 # uploaded to https://repo-default.voidlinux.org/distfiles/
 #
 pkgname=rust
-version=1.76.0
-revision=2
+version=1.77.1
+revision=1
 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
 makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-devel"
 depends="rust-std gcc"
@@ -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=9e5cff033a7f0d2266818982ad90e4d3e4ef8f8ee1715776c6e25073a136c021
+checksum=ee106e4c569f52dba3b5b282b105820f86bd8f6b3d09c06b8dce82fb1bb3a4a1
 lib32disabled=yes
 make_check=no # CBA for now
 python_version=3 # needed for python files in rust-src
@@ -139,6 +139,7 @@ do_configure() {
 		--set="build.submodules=false" \
 		--set="build.rustc=/usr/bin/rustc" \
 		--set="build.cargo=/usr/bin/cargo" \
+		--set="build.optimized-compiler-builtins=false" \
 		--set="target.${RUST_BUILD}.crt-static=false" \
 		--set="target.${RUST_BUILD}.cc=${CC_host:-$CC}" \
 		--set="target.${RUST_BUILD}.cxx=${CXX_host:-$CXX}" \

From 3143da0b0a491c26f473021447526ecf2091dd1b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 21 Mar 2024 19:31:12 +0100
Subject: [PATCH 4/4] cargo: update to 1.77.1

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

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 71c35f0f1ccd6d..4d75e4a7306e12 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=1.76.0
-revision=2
-_cargo_revision=0.77.0
+version=1.77.1
+revision=1
+_cargo_revision=0.78.1
 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=1c33e2feb197f848f082fdc074162328e231c2f68394e0e1d2dbbbf79c9fc3ec
+checksum=0283fecebb6d3cbd111688eb0359edaf6676f4b2829201a8afe5a0e3afdb4b48
 replaces="cargo-tree>=0"
 
 build_options="static bindist"

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
  2024-03-30 12:37 ` [PR PATCH] [Updated] " tranzystorekk
  2024-04-02 10:08 ` tranzystorekk
@ 2024-04-02 10:28 ` tranzystorekk
  2024-04-02 10:44 ` TeddyDD
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-04-02 10:28 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031637636

Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:

## New failures since 1.76

### missing `libgit2` dependency

- `cargo-crev` https://0x0.st/Xzxa.txt
- `cargo-geiger` https://0x0.st/XzxB.txt
- `gitui` https://0x0.st/XzxM.txt cc @sgn
- `gping` https://0x0.st/Xzxu.txt cc @icp1994
- `mise` https://0x0.st/XzxS.log cc @TeddyDD 
- `sheldon` https://0x0.st/Xzxj.log

### Misc

- `cargo-modules` https://0x0.st/XzxT.txt cc @icp1994 (release tags have been renamed to include the "v" prefix)

## Known failures

- `fool`
- `ion`
- `lapce`
- `sequoia-sqv` https://0x0.st/Xzxc.txt cc @classabbyamp (see https://github.com/void-linux/void-packages/pull/48634#issuecomment-1944911185)
- `spotifyd`
- `spotify-tui`
- `wasmtime`

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (2 preceding siblings ...)
  2024-04-02 10:28 ` tranzystorekk
@ 2024-04-02 10:44 ` TeddyDD
  2024-04-02 10:53 ` tranzystorekk
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: TeddyDD @ 2024-04-02 10:44 UTC (permalink / raw)
  To: ml

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

New comment by TeddyDD on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031668827

Comment:
Mise should be fixed by #49671

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (3 preceding siblings ...)
  2024-04-02 10:44 ` TeddyDD
@ 2024-04-02 10:53 ` tranzystorekk
  2024-04-02 12:04 ` tranzystorekk
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-04-02 10:53 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031637636

Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:

## New failures since 1.76

### missing `libgit2` dependency

- `cargo-crev` https://0x0.st/Xzxa.txt
- `cargo-geiger` https://0x0.st/XzxB.txt
- `gitui` https://0x0.st/XzxM.txt cc @sgn
- `gping` https://0x0.st/Xzxu.txt cc @icp1994
- `mise` https://0x0.st/XzxS.log cc @TeddyDD #49671 
- `sheldon` https://0x0.st/Xzxj.log #49672 

### Misc

- `cargo-modules` https://0x0.st/XzxT.txt cc @icp1994 (release tags have been renamed to include the "v" prefix)

## Known failures

- `fool`
- `ion`
- `lapce`
- `sequoia-sqv` https://0x0.st/Xzxc.txt cc @classabbyamp (see https://github.com/void-linux/void-packages/pull/48634#issuecomment-1944911185)
- `spotifyd`
- `spotify-tui`
- `wasmtime`

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (4 preceding siblings ...)
  2024-04-02 10:53 ` tranzystorekk
@ 2024-04-02 12:04 ` tranzystorekk
  2024-04-02 19:33 ` tranzystorekk
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-04-02 12:04 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031637636

Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:

## New failures since 1.76

### missing `libgit2` dependency

- `cargo-crev` https://0x0.st/Xzxa.txt
- `cargo-geiger` https://0x0.st/XzxB.txt
- `gitui` https://0x0.st/XzxM.txt cc @cinerea0
- `gping` https://0x0.st/Xzxu.txt cc @icp1994
- `mise` https://0x0.st/XzxS.log cc @TeddyDD #49671 
- `sheldon` https://0x0.st/Xzxj.log #49672 

### Misc

- `cargo-modules` https://0x0.st/XzxT.txt cc @icp1994 (release tags have been renamed to include the "v" prefix)

## Known failures

- `fool`
- `ion`
- `lapce`
- `sequoia-sqv` https://0x0.st/Xzxc.txt cc @classabbyamp (see https://github.com/void-linux/void-packages/pull/48634#issuecomment-1944911185)
- `spotifyd`
- `spotify-tui`
- `wasmtime`

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (5 preceding siblings ...)
  2024-04-02 12:04 ` tranzystorekk
@ 2024-04-02 19:33 ` tranzystorekk
  2024-04-02 19:34 ` icp1994
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-04-02 19:33 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031637636

Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:

## New failures since 1.76

### missing `libgit2` dependency

- `cargo-crev` https://0x0.st/Xzxa.txt
- `cargo-geiger` https://0x0.st/XzxB.txt
- `gitui` https://0x0.st/XzxM.txt cc @cinerea0
- `gping` https://0x0.st/Xzxu.txt cc @icp1994 #49676 
- `mise` https://0x0.st/XzxS.log cc @TeddyDD #49671 
- `sheldon` https://0x0.st/Xzxj.log #49672 

### Misc

- `cargo-modules` https://0x0.st/XzxT.txt cc @icp1994 (release tags have been renamed to include the "v" prefix)

## Known failures

- `fool`
- `ion`
- `lapce`
- `sequoia-sqv` https://0x0.st/Xzxc.txt cc @classabbyamp (see https://github.com/void-linux/void-packages/pull/48634#issuecomment-1944911185)
- `spotifyd`
- `spotify-tui`
- `wasmtime`

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (6 preceding siblings ...)
  2024-04-02 19:33 ` tranzystorekk
@ 2024-04-02 19:34 ` icp1994
  2024-04-02 19:43 ` tranzystorekk
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: icp1994 @ 2024-04-02 19:34 UTC (permalink / raw)
  To: ml

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2032957949

Comment:
gping https://github.com/void-linux/void-packages/pull/49676
cargo-modules https://github.com/void-linux/void-packages/pull/49447

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (7 preceding siblings ...)
  2024-04-02 19:34 ` icp1994
@ 2024-04-02 19:43 ` tranzystorekk
  2024-04-02 21:46 ` tranzystorekk
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-04-02 19:43 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031637636

Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:

## New failures since 1.76

### missing `libgit2` dependency

- `cargo-crev` https://0x0.st/Xzxa.txt
- `cargo-geiger` https://0x0.st/XzxB.txt
- `gitui` https://0x0.st/XzxM.txt cc @cinerea0
- `gping` https://0x0.st/Xzxu.txt cc @icp1994 #49676 
- `mise` https://0x0.st/XzxS.log cc @TeddyDD #49671 
- `sheldon` https://0x0.st/Xzxj.log #49672 

### Misc

- `cargo-modules` https://0x0.st/XzxT.txt cc @icp1994 (release tags have been renamed to include the "v" prefix) #49447 

## Known failures

- `fool`
- `ion`
- `lapce`
- `sequoia-sqv` https://0x0.st/Xzxc.txt cc @classabbyamp (see https://github.com/void-linux/void-packages/pull/48634#issuecomment-1944911185)
- `spotifyd`
- `spotify-tui`
- `wasmtime`

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (8 preceding siblings ...)
  2024-04-02 19:43 ` tranzystorekk
@ 2024-04-02 21:46 ` tranzystorekk
  2024-04-03 10:33 ` cinerea0
  2024-04-04 11:29 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-04-02 21:46 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031637636

Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:

## New failures since 1.76

### missing `libgit2` dependency

- `cargo-crev` https://0x0.st/Xzxa.txt
- `cargo-geiger` https://0x0.st/XzxB.txt
- `gitui` https://0x0.st/XzxM.txt cc @cinerea0
- `gping` https://0x0.st/Xzxu.txt cc @icp1994 #49676 
- `mise` https://0x0.st/XzxS.log cc @TeddyDD #49671 
- `sheldon` https://0x0.st/Xzxj.log #49672 

### Misc

- `cargo-modules` https://0x0.st/XzxT.txt cc @icp1994 (release tags have been renamed to include the "v" prefix) #49447 

## Known failures

- `fool`
- `ion`
- `lapce`
- `sequoia-sqv` https://0x0.st/Xzxc.txt cc @classabbyamp (see https://github.com/void-linux/void-packages/pull/48634#issuecomment-1944911185) https://github.com/void-linux/void-packages/commit/2598e7a037d7a0997a998bc6771ce3f25564b78e
- `spotifyd`
- `spotify-tui`
- `wasmtime`

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

* Re: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (9 preceding siblings ...)
  2024-04-02 21:46 ` tranzystorekk
@ 2024-04-03 10:33 ` cinerea0
  2024-04-04 11:29 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: cinerea0 @ 2024-04-03 10:33 UTC (permalink / raw)
  To: ml

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

New comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49437#issuecomment-2031637636

Comment:
Results of `build_style=cargo` rebuild for x86_64-gnu:

## New failures since 1.76

### missing `libgit2` dependency

- `cargo-crev` https://0x0.st/Xzxa.txt
- `cargo-geiger` https://0x0.st/XzxB.txt
- `gitui` https://0x0.st/XzxM.txt cc @cinerea0 #49691
- `gping` https://0x0.st/Xzxu.txt cc @icp1994 #49676 
- `mise` https://0x0.st/XzxS.log cc @TeddyDD #49671 
- `sheldon` https://0x0.st/Xzxj.log #49672 

### Misc

- `cargo-modules` https://0x0.st/XzxT.txt cc @icp1994 (release tags have been renamed to include the "v" prefix) #49447 

## Known failures

- `fool`
- `ion`
- `lapce`
- `sequoia-sqv` https://0x0.st/Xzxc.txt cc @classabbyamp (see https://github.com/void-linux/void-packages/pull/48634#issuecomment-1944911185) https://github.com/void-linux/void-packages/commit/2598e7a037d7a0997a998bc6771ce3f25564b78e
- `spotifyd`
- `spotify-tui`
- `wasmtime`

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

* Re: [PR PATCH] [Merged]: Rust 1.77
  2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
                   ` (10 preceding siblings ...)
  2024-04-03 10:33 ` cinerea0
@ 2024-04-04 11:29 ` classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2024-04-04 11:29 UTC (permalink / raw)
  To: ml

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

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

Rust 1.77
https://github.com/void-linux/void-packages/pull/49437

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Cargo 1.77 started using features from git2 0.18 that we currently patch back to 0.17 to accommodate libgit2 1.6:
https://github.com/rust-lang/cargo/blob/3fe68eabf93cbf3772bbcad09a9206c783e2de3f/src/cargo/sources/git/utils.rs#L1108-L1110

The simplest way forward is probably to stop downgrading git2, but that requires merging https://github.com/void-linux/void-packages/pull/45976 first.

Also had to manually disable optimized-compiler-builtins as they are incorrectly enabled by default: https://github.com/rust-lang/rust/pull/119556

<!--
#### 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] 13+ messages in thread

end of thread, other threads:[~2024-04-04 11:29 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-21 18:42 [PR PATCH] [WIP] Rust 1.77 tranzystorekk
2024-03-30 12:37 ` [PR PATCH] [Updated] " tranzystorekk
2024-04-02 10:08 ` tranzystorekk
2024-04-02 10:28 ` tranzystorekk
2024-04-02 10:44 ` TeddyDD
2024-04-02 10:53 ` tranzystorekk
2024-04-02 12:04 ` tranzystorekk
2024-04-02 19:33 ` tranzystorekk
2024-04-02 19:34 ` icp1994
2024-04-02 19:43 ` tranzystorekk
2024-04-02 21:46 ` tranzystorekk
2024-04-03 10:33 ` cinerea0
2024-04-04 11:29 ` [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).