From 88c076875eb1dfdffb95b5d241f85ab871ca3baf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 15:09:53 -0800
Subject: [PATCH] build-style/void-cross: disable libssp

---
 common/build-style/void-cross.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d839..6914c40bc00 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
 	make ${makejobs}
 	make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
 
+	CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+	CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+	${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+	${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+	cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
 	touch ${wrksrc}/.musl_build_done
 }
 
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
 		--disable-libvtv \
 		--disable-libsanitizer \
 		--disable-libstdcxx-pch \
+		--disable-libssp \
 		--enable-shared \
 		--enable-threads=posix \
 		--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
 		--enable-lto \
 		--enable-default-pie \
 		--enable-default-ssp \
-		--enable-libssp \
 		--with-gnu-ld \
 		--with-gnu-as \
 		--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
 		for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
 			ln -sf libc.so ${f}
 		done
+
+		cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
 	else
 		# Install glibc
 		cd ${wrksrc}/glibc_build