aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Puc <tranzystorek.io@protonmail.com>2024-03-21 18:30:09 +0000
committerclassabbyamp <5366828+classabbyamp@users.noreply.github.com>2024-04-04 11:29:33 +0000
commit3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0 (patch)
tree0aea7470d97095c8535e07c6a1244fb488fdd723
parent1f71f06fa48278a2f301e38e57a7c74333d88203 (diff)
downloadvoid-packages-3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0.tar
void-packages-3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0.tar.gz
void-packages-3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0.tar.bz2
void-packages-3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0.tar.lz
void-packages-3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0.tar.xz
void-packages-3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0.tar.zst
void-packages-3eb226a42dc9a4841bc546fda4c7788fa1cdb0c0.zip
rust: update to 1.77.1
-rw-r--r--srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch22
-rw-r--r--srcpkgs/rust/template7
2 files changed, 15 insertions, 14 deletions
diff --git a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
index ec26d9c26ae..df82caa9dd6 100644
--- a/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
+++ b/srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
@@ -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
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index b93271e97de..21e11623638 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -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"
@@ -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
@@ -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}" \