Skip to content

Commit

Permalink
rust: update to 1.77.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tranzystorekk authored and classabbyamp committed Apr 4, 2024
1 parent 1f71f06 commit 3eb226a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
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
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

0 comments on commit 3eb226a

Please sign in to comment.