moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

build-style/void-cross: disable libssp

Browse source
This commit is contained in:
oreo639 2022-12-21 15:09:53 -08:00 • committed by Đoàn Trần Công Danh
parent d4625ea63d
commit 88c076875e
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/build-style/void-cross.sh
View file

@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs} make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install 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 touch ${wrksrc}/.musl_build_done
} }
@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \ --disable-libvtv \
--disable-libsanitizer \ --disable-libsanitizer \
--disable-libstdcxx-pch \ --disable-libstdcxx-pch \
--disable-libssp \
--enable-shared \ --enable-shared \
--enable-threads=posix \ --enable-threads=posix \
--enable-__cxa_atexit \ --enable-__cxa_atexit \
@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \ --enable-lto \
--enable-default-pie \ --enable-default-pie \
--enable-default-ssp \ --enable-default-ssp \
--enable-libssp \
--with-gnu-ld \ --with-gnu-ld \
--with-gnu-as \ --with-gnu-as \
--with-linker-hash-style=gnu \ --with-linker-hash-style=gnu \
@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f} ln -sf libc.so ${f}
done done
cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else else
# Install glibc # Install glibc
cd ${wrksrc}/glibc_build cd ${wrksrc}/glibc_build