PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

rust: update to 1.77.1

Browse Source
This commit is contained in:
Marcin Puc 2024-03-21 19:30:09 +01:00 committed by classabbyamp
parent 1f71f06fa4
commit 3eb226a42d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
srcpkgs/rust/patches/0014-copy-new-version-of-need-ssp_nonshared.patch-from-al.patch
View File

@ -5,16 +5,16 @@ Subject: [PATCH 14/15] copy new version of need-ssp_nonshared.patch from
alpine alpine
--- ---
library/std/src/sys/unix/mod.rs | 4 ++++ library/std/src/sys/pal/unix/mod.rs | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs diff --git a/library/std/src/sys/pal/unix/mod.rs b/library/std/src/sys/pal/unix/mod.rs
index 34a023b02..934a87570 100644 index 43cb9d89b..4158c79da 100644
--- a/library/std/src/sys/unix/mod.rs --- a/library/std/src/sys/pal/unix/mod.rs
+++ b/library/std/src/sys/unix/mod.rs +++ b/library/std/src/sys/pal/unix/mod.rs
@@ -297,6 +297,10 @@ cfg_if::cfg_if! { @@ -379,6 +379,10 @@ cfg_if::cfg_if! {
#[link(name = "dl")] #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
#[link(name = "log")] #[link(name = "log", cfg(not(target_feature = "crt-static")))]
extern "C" {} extern "C" {}
+ } else if #[cfg(all(target_os = "linux", target_env = "musl"))] { + } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
+ #[link(name = "ssp_nonshared")] + #[link(name = "ssp_nonshared")]
@ -24,5 +24,5 @@ index 34a023b02..934a87570 100644
#[link(name = "execinfo")] #[link(name = "execinfo")]
#[link(name = "pthread")] #[link(name = "pthread")]
-- --
2.37.2 2.44.0

7
srcpkgs/rust/template
View File

@ -8,8 +8,8 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/ # uploaded to https://repo-default.voidlinux.org/distfiles/
# #
pkgname=rust pkgname=rust
version=1.76.0 version=1.77.1
revision=2 revision=1
hostmakedepends="curl pkg-config python3 tar cargo-bootstrap" 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 llvm17-devel"
depends="rust-std gcc" depends="rust-std gcc"
@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0" license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/" homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
checksum=9e5cff033a7f0d2266818982ad90e4d3e4ef8f8ee1715776c6e25073a136c021 checksum=ee106e4c569f52dba3b5b282b105820f86bd8f6b3d09c06b8dce82fb1bb3a4a1
lib32disabled=yes lib32disabled=yes
make_check=no # CBA for now make_check=no # CBA for now
python_version=3 # needed for python files in rust-src python_version=3 # needed for python files in rust-src
@ -139,6 +139,7 @@ do_configure() {
--set="build.submodules=false" \ --set="build.submodules=false" \
--set="build.rustc=/usr/bin/rustc" \ --set="build.rustc=/usr/bin/rustc" \
--set="build.cargo=/usr/bin/cargo" \ --set="build.cargo=/usr/bin/cargo" \
--set="build.optimized-compiler-builtins=false" \
--set="target.${RUST_BUILD}.crt-static=false" \ --set="target.${RUST_BUILD}.crt-static=false" \
--set="target.${RUST_BUILD}.cc=${CC_host:-$CC}" \ --set="target.${RUST_BUILD}.cc=${CC_host:-$CC}" \
--set="target.${RUST_BUILD}.cxx=${CXX_host:-$CXX}" \ --set="target.${RUST_BUILD}.cxx=${CXX_host:-$CXX}" \