Skip to content

Rust 1.77 #49437

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

Merged
classabbyamp merged 4 commits into from
Apr 4, 2024
Merged

Rust 1.77 #49437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
728617f
rust-bootstrap: update to 1.77.1
tranzystorekk Mar 21, 2024
697154c
cargo-bootstrap: update to 1.77.1
tranzystorekk Mar 21, 2024
c76a60d
rust: update to 1.77.1
tranzystorekk Mar 21, 2024
3143da0
cargo: update to 1.77.1
tranzystorekk Mar 21, 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
8 changes: 4 additions & 4 deletions srcpkgs/cargo-bootstrap/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>"
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions srcpkgs/cargo/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions srcpkgs/rust-bootstrap/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>"
Expand Down Expand Up @@ -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)
Expand Down
22 changes: 11 additions & 11 deletions srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

7 changes: 4 additions & 3 deletions srcpkgs/rust/template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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}" \
Expand Down