PktSurf
9d657e0a1d
Renamed .SMBuild files to smbuild for simplicity Added musl-fts, musl-obstack, glslang, python-glad, libptytty, libmilter, elfutils and fuse to base section build list Discarded fuse2 and fuse3 from base section Temporarily discarded slapt-get, syslinux, p7zip, acpid, libelf-compat, gnu-eif, libtirpc, mozilla-nss, lua53, qpdf, kernel-source and signify from base section build list Disabled nls and made amends to base/e2fsprogs Upgraded base/git to 2.46.2 Upgraded extra/gnumeric to 1.12.57 Disabled nls in base/gnutls, extra/dia Disabled a patch and made amends in base/llvm Fixed configure.local file in base/mandoc Upgraded base/rust to 1.79 Fixed a ton of build files to use build prefix as /usr and miscellaneous changes Discarded extra/bluez,blueman,scrcpy,adafruit-io Added tomb to extra Added new build option to extra/libass Upgraded extra/mpv to 0.37.0 Disabled tests in gtk/gdk-pixbuf Upgraded gtk/goffice to 0.10.57 Added gtk-doc to gtk section Fixed build options in gtk/gtk2 Added new patches to gtk/gtk3 Added gtksourceview to gtk section Added vulkan-headers to xorg section Upgraded xorg/mesa to 23.1.9 Added libplacebo to xorg section Fixed build stuff in xorg/glew
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
this is needed for libssp-less __stack_chk_fail_local (on x86),
|
|
the other Bdynamic patch seems to break the top hunk,
|
|
so we need the bottom hack
|
|
--
|
|
diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs
|
|
index 68c9520..63f8a48 100644
|
|
--- a/library/std/src/sys/pal/unix/mod.rs
|
|
+++ b/library/std/src/sys/pal/unix/mod.rs
|
|
@@ -376,6 +376,9 @@ 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", kind = "static")]
|
|
+ extern "C" {}
|
|
} else if #[cfg(target_os = "freebsd")] {
|
|
#[link(name = "execinfo")]
|
|
#[link(name = "pthread")]
|
|
--- a/compiler/rustc_llvm/build.rs
|
|
+++ b/compiler/rustc_llvm/build.rs
|
|
@@ -110,6 +110,8 @@
|
|
return;
|
|
}
|
|
|
|
+ println!("cargo:rustc-link-lib=ssp_nonshared");
|
|
+
|
|
restore_library_path();
|
|
|
|
let target = env::var("TARGET").expect("TARGET was not set");
|