Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rust 1.80 #51458

Merged
merged 4 commits into from
Jul 29, 2024
Merged

Rust 1.80 #51458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e912447
rust-bootstrap: update to 1.80.0
tranzystorekk Jul 25, 2024
1326947
cargo-bootstrap: update to 1.80.0
tranzystorekk Jul 25, 2024
6594ead
rust: update to 1.80.0
tranzystorekk Jul 25, 2024
e41aacb
cargo: update to 1.80.0
tranzystorekk Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rust: update to 1.80.0
  • Loading branch information
@tranzystorekk
tranzystorekk committed Jul 27, 2024
commit 6594ead346278ebc39945a62922ea8a66224e66c
8 changes: 4 additions & 4 deletions srcpkgs/rust/patches/0010-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ From: q66 <daniel@octaforge.org>
Date: Sun, 3 May 2020 18:02:03 +0200
Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate

diff --git a/vendor/libc-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")))]
Expand Down
13 changes: 8 additions & 5 deletions srcpkgs/rust/template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <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=172ecf3c7d1f9d9fb16cd2a628869782670416ded0129e524a86751f961448c0
checksum=6f606c193f230f6b2cae4576f7b24d50f5f9b25dff11dbf9b22f787d3521d672
lib32disabled=yes
make_check=no # CBA for now
python_version=3 # needed for python files in rust-src
Expand All @@ -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
Expand All @@ -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() {
Expand Down