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

build-style/void-cross: Update flags for gcc12 and glibc 2.36

Browse source 
gcov can't be built without libc:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100289

Remove -no-pie from build. glibc 2.35 and newer uses -static-pie by default:
https://sourceware.org/pipermail/glibc-cvs/2021q4/075916.html
This commit is contained in:
oreo639 2022-11-05 11:33:12 -07:00 • committed by Đoàn Trần Công Danh
parent 9621ea7863
commit 1be73bd4fa
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ _void_cross_build_binutils() {
--sbindir=/usr/bin \ --sbindir=/usr/bin \
--libdir=/usr/lib \ --libdir=/usr/lib \
--libexecdir=/usr/lib \ --libexecdir=/usr/lib \
--sysconfdir=/etc \
--target=${tgt} \ --target=${tgt} \
--with-sysroot=/usr/${tgt} \ --with-sysroot=/usr/${tgt} \
--disable-nls \ --disable-nls \
@ -60,7 +61,9 @@ _void_cross_build_binutils() {
--disable-multilib \ --disable-multilib \
--disable-werror \ --disable-werror \
--disable-gold \ --disable-gold \
--disable-gprofng \
--enable-relro \ --enable-relro \
--enable-new-dtags \
--enable-plugins \ --enable-plugins \
--enable-64-bit-bfd \ --enable-64-bit-bfd \
--enable-deterministic-archives \ --enable-deterministic-archives \
@ -132,6 +135,7 @@ _void_cross_build_bootstrap_gcc() {
--disable-libssp \ --disable-libssp \
--disable-libitm \ --disable-libitm \
--disable-libatomic \ --disable-libatomic \
--disable-gcov \
--disable-threads \ --disable-threads \
--disable-sjlj-exceptions \ --disable-sjlj-exceptions \
--enable-languages=c \ --enable-languages=c \
@ -381,6 +385,7 @@ _void_cross_build_gcc() {
extra_args+=" --disable-gnu-unique-object" extra_args+=" --disable-gnu-unique-object"
extra_args+=" libat_cv_have_ifunc=no" extra_args+=" libat_cv_have_ifunc=no"
else else
extra_args+=" --enable-clocale=gnu"
extra_args+=" --enable-gnu-unique-object" extra_args+=" --enable-gnu-unique-object"
fi fi
@ -460,6 +465,14 @@ do_build() {
local binutils_ver linux_ver gcc_ver libc_ver libucontext_ver local binutils_ver linux_ver gcc_ver libc_ver libucontext_ver
local tgt=${sourcepkg/cross-} local tgt=${sourcepkg/cross-}
export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
# Disable explicit -fno-PIE, gcc/binutils/libc will figure this out itself.
export CFLAGS="${CFLAGS//-fno-PIE/}"
export CXXFLAGS="${CXXFLAGS//-fno-PIE/}"
export LDFLAGS="${LDFLAGS//-no-pie/}"
_void_cross_test_ver binutils _void_cross_test_ver binutils
_void_cross_test_ver linux _void_cross_test_ver linux
_void_cross_test_ver gcc _void_cross_test_ver gcc
@ -625,6 +638,9 @@ do_install() {
# then remove it because it conflicts with libquadmath package # then remove it because it conflicts with libquadmath package
rm -rf ${DESTDIR}/${sysroot}/usr/lib/libquadmath.* rm -rf ${DESTDIR}/${sysroot}/usr/lib/libquadmath.*
# Remove libdep linker plugin because it conflicts with system binutils
rm -f ${DESTDIR}/usr/lib/bfd-plugins/libdep*
# Remove leftover symlinks # Remove leftover symlinks
rm -f ${DESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE} rm -f ${DESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
rm -f ${DESTDIR}/lib* rm -f ${DESTDIR}/lib*