wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

build-style/void-cross.sh: include libquadmath and remove libgomp

Browse source
This commit is contained in:
oreo639 2024-01-24 13:06:14 -08:00
parent df9b89a25c
commit 4c4a7fb004
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,13 +404,8 @@ _void_cross_build_gcc() {
# note on --disable-libquadmath: # note on --disable-libquadmath:
# on some platforms the library is actually necessary for the # on some platforms the library is actually necessary for the
# fortran frontend to build, but still disable it because it # fortran frontend to build, platforms where this is a problem
# should not be in the resulting packages; it conflicts with # should explicitly force libquadmath to be on via cross_gcc_configure_args
# the libquadmath you can install into the cross root
#
# platforms where this is a problem should explicitly force
# libquadmath to be on via cross_gcc_configure_args, the
# do_install in this build-style automatically removes it
# #
../gcc-${ver}/configure \ ../gcc-${ver}/configure \
--prefix=/usr \ --prefix=/usr \
@ -646,9 +641,9 @@ do_install() {
ln -sf libgnat-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so ln -sf libgnat-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so
rm -vf ${DESTDIR}/${adalib}/libgna{rl,t}.so rm -vf ${DESTDIR}/${adalib}/libgna{rl,t}.so
# If libquadmath was forced (needed for gfortran on some platforms) # Remove libgomp library because it conflicts with libgomp and
# then remove it because it conflicts with libquadmath package # libgomp-devel packages
rm -rf ${DESTDIR}/${sysroot}/usr/lib/libquadmath.* rm -f ${DESTDIR}/usr/lib/libgomp*
# Remove libdep linker plugin because it conflicts with system binutils # Remove libdep linker plugin because it conflicts with system binutils
rm -f ${DESTDIR}/usr/lib/bfd-plugins/libdep* rm -f ${DESTDIR}/usr/lib/bfd-plugins/libdep*