PktSurf
03b8e2675c
net subsection package build files Upgraded base/rust to 1.64.0 Added cbindgen 0.24.3 to base Upgraded base/gdbm to 1.23 Added -mno-outline-atomics as CXXFLAGS to fix build breakage in base/gpgme Fixed rc.gtk script in base/initfs Added preservestaticlibs to prevent static libraries from being discarded and upgraded base/libcap to 2.67 Upgraded base/nodejs to 18.14.2 Temporarily discarded unnecessary code and comments in installpkg script in base/pkgtools Added protobuf 3.14.0 to base Upgraded base/python3 to 3.9.16 Upgraded base/sccache to 0.3.3 Upgraded extra/abiword to 3.0.5 Added adafruit-io 2.7.0 to extra Added code to discard creation of systemd directory in extra/bluez Added code to discard /usr directory in extra/ffmpeg Removed unnecessary CFLAGS in extra/freerdp Upgraded extra/imagemagick to 7.1.0 Upgraded extra/vim to 9.0.1000 Added build option to disable linking against gtk2 in extra/xarchiver Upgraded heavybuilds/firefox to 102.8.0 ESR, discarded extraneous files that were part of it Upgraded net/fail2ban to 1.0.2 Discarded unnecessary CFLAGS in net/lynx Optimised build code in net/maccalc Fixed noautoconfsite variable and added --disable-xxhash build option to net/rsync Removed unnecessary CFLAGS in xorg/libtiff and xorg/libxklavier
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 7e100ca9dad23efa1aafccd8faf86ec5fa85c351 Mon Sep 17 00:00:00 2001
|
|
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
|
|
|
|
---
|
|
vendor/libc/src/unix/mod.rs | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
|
|
index ecee44411..7ae05f24e 100644
|
|
--- a/vendor/libc/src/unix/mod.rs
|
|
+++ b/vendor/libc/src/unix/mod.rs
|
|
@@ -337,11 +337,11 @@ cfg_if! {
|
|
#[link(name = "c", cfg(not(target_feature = "crt-static")))]
|
|
extern {}
|
|
} else if #[cfg(target_env = "musl")] {
|
|
+ #[link(name = "c")]
|
|
+ extern {}
|
|
#[cfg_attr(feature = "rustc-dep-of-std",
|
|
- link(name = "c", kind = "static", modifiers = "-bundle",
|
|
+ link(name = "gcc", kind = "static", modifiers = "-bundle",
|
|
cfg(target_feature = "crt-static")))]
|
|
- #[cfg_attr(feature = "rustc-dep-of-std",
|
|
- link(name = "c", cfg(not(target_feature = "crt-static"))))]
|
|
extern {}
|
|
} else if #[cfg(target_os = "emscripten")] {
|
|
#[link(name = "c")]
|
|
--
|
|
2.37.2
|
|
|