diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template index 149b708c352122..d3451bdaffcd8b 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.79.0 +version=1.80.0 revision=1 short_desc="Bootstrap binaries of Rust package manager" maintainer="Orphaned " @@ -24,15 +24,15 @@ esac case "$XBPS_TARGET_MACHINE" in i686) distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz" - checksum="57bd43f363ebd399a38aa4ac3b137e9172706770f8b23479f9dd859c6ae779ab" + checksum="93c92b3c6716db416f2d3ee801079aed0893d3ba148ba1d670791ddb02d8f998" ;; x86_64) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz" - checksum="07fcadd27b645ad58ff4dae5ef166fd730311bbae8f25f6640fe1bfd2a1f3c3c" + checksum="5602ba863f5276cfaa7ed3a8dd94d187fbd0319a1b4bbb9284e77fb6b7168a41" ;; x86_64-musl) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz" - checksum="c053ba22b95615f41f27b42f5bacf3fbb26abba24ac01d2638877a584ff19738" + checksum="e6a0ba9e1c9476c605a91352afaac3fa557ab64f3d8a9db8be401307f5d1a81c" ;; # placeholders for user-supplied distfiles ppc64le) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 5873a19e074600..0faaf11eba58a7 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.79.0 +version=1.80.0 revision=1 -_cargo_revision=0.80.0 +_cargo_revision=0.81.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 " license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz" -checksum=542efc5daa159e2942d454eb2815247a96589363977429bd473f8cac8a55636e +checksum=5d2ea954f1a8bf03389fe2cefc5603de180a0c0010aa66628a325007216ef862 replaces="cargo-tree>=0" build_options="static bindist" diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template index f78831b709513d..f325d076499b5f 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.79.0 +version=1.80.0 revision=1 short_desc="Rust programming language bootstrap toolchain" maintainer="Orphaned " @@ -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=" - 4695a6eb66252d519510ca0a859803fff3a5041f71004404df0ccc9fbf0298d5 - 158294f7c424ef75d84046b573f225c15d531745cc79d416a18c11aa8253830e" + d2e4ceb3b3d2c41ba5d5ffc07f09ea46347c4d92e6411d66f0873c664684f68e + f5bcf6d36de3947c663da3f659fcbf8dbb261185284f87b332ab22f490304153" ;; 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=" - a04cf42022d0a5faf01c31082bfb1dde9c38409f0ca6da90a3e40faa03e797ae - 2c914483c0882d44af2e50a181cbd2c953d672d50b31aa669ee2346cade1f108" + ef1692e3d67236868d32ef26f96f47792b1c3a3f9747bbe05c63742464307c4f + c722cba93c9627e04a6a5ecc749cde9dda39f15e4d02fb6ae8d0b27e02e6488a" ;; 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=" - 155deffbdc08c963bd47108eaccf0db81d5f9bc6bb4a4cefa03e40ae9e2981fc - 30b9418561e6a7c18396a259304d3ddb4ad9d262f0ed6f227e08d232b8b32e8c" + 8c64236957359cea987dbc6b99d4d81e403186c7e217e6dfca52b74fd1efc0c6 + 6570068f0c95fa7a85b1fdf7b72d934fb4cf1689f833ab766ea6ae8cb40d3348" ;; # placeholders for user-supplied distfiles ppc64le) 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 0924889cbfaa3e..24b7469fe64d69 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 a37b076528c7c8..9327db52dc3a00 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() {