From 40b911c58b3e9e7085873c535fa8063127550f17 Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Thu, 25 Jul 2024 14:51:13 +0200 Subject: [PATCH] rust: update to 1.80.0 --- ...ic-linkage-of-musl-libc-for-the-libc-crate.patch | 8 ++++---- srcpkgs/rust/template | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) 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 0924889cbfa..24b7469fe64 100644 --- a/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch +++ b/srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch @@ -3,10 +3,10 @@ From: q66 Date: Sun, 3 May 2020 18:02:03 +0200 Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate -diff --git a/vendor/libc-0.2.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 +diff --git a/vendor/libc-0.2.155/src/unix/mod.rs b/vendor/libc-0.2.155/src/unix/mod.rs +index 49984d3f0..6c3b5a47e 100644 +--- a/vendor/libc-0.2.155/src/unix/mod.rs ++++ b/vendor/libc-0.2.155/src/unix/mod.rs @@ -347,7 +347,14 @@ cfg_if! { #[link(name = "dl", cfg(not(target_feature = "crt-static")))] #[link(name = "c", cfg(not(target_feature = "crt-static")))] diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index a37b076528c..9327db52dc3 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -8,17 +8,17 @@ # uploaded to https://repo-default.voidlinux.org/distfiles/ # pkgname=rust -version=1.79.0 +version=1.80.0 revision=1 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap" -makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-devel" +makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm18-devel" depends="rust-std gcc" short_desc="Safe, concurrent, practical systems language" maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://www.rust-lang.org/" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=172ecf3c7d1f9d9fb16cd2a628869782670416ded0129e524a86751f961448c0 +checksum=6f606c193f230f6b2cae4576f7b24d50f5f9b25dff11dbf9b22f787d3521d672 lib32disabled=yes make_check=no # CBA for now python_version=3 # needed for python files in rust-src @@ -34,7 +34,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" rust llvm17-devel" + hostmakedepends+=" rust llvm18-devel" # These are required for building the buildhost's stage0/1 hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel" else @@ -58,7 +58,10 @@ post_patch() { fi # clear out all the checksum nonsense of patched vendor crates - _clear_vendor_checksums libc-0.2.153 + _clear_vendor_checksums libc-0.2.155 + + # pre-configure 01-override-config overwrites vendor files + _clear_vendor_checksums onig_sys-69.8.1 } do_configure() {