diff options
author | oreo639 <oreo6391@gmail.com> | 2024-01-24 21:06:14 +0000 |
---|---|---|
committer | oreo639 <oreo6391@gmail.com> | 2024-01-28 06:05:13 +0000 |
commit | 4c4a7fb0040eef447cac60ecaccfba715e725f0f (patch) | |
tree | 574a80e9945028fb3edc456ac5ec6e49a01d91cb /common/build-style | |
parent | df9b89a25c692134cb6940599d6b3038839a9ff7 (diff) | |
download | void-packages-4c4a7fb0040eef447cac60ecaccfba715e725f0f.tar void-packages-4c4a7fb0040eef447cac60ecaccfba715e725f0f.tar.gz void-packages-4c4a7fb0040eef447cac60ecaccfba715e725f0f.tar.bz2 void-packages-4c4a7fb0040eef447cac60ecaccfba715e725f0f.tar.lz void-packages-4c4a7fb0040eef447cac60ecaccfba715e725f0f.tar.xz void-packages-4c4a7fb0040eef447cac60ecaccfba715e725f0f.tar.zst void-packages-4c4a7fb0040eef447cac60ecaccfba715e725f0f.zip |
build-style/void-cross.sh: include libquadmath and remove libgomp
Diffstat (limited to 'common/build-style')
-rw-r--r-- | common/build-style/void-cross.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 9193b7cf64b..f2e1e7ec308 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -404,13 +404,8 @@ _void_cross_build_gcc() { # note on --disable-libquadmath: # on some platforms the library is actually necessary for the - # fortran frontend to build, but still disable it because it - # should not be in the resulting packages; it conflicts with - # 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 + # fortran frontend to build, platforms where this is a problem + # should explicitly force libquadmath to be on via cross_gcc_configure_args # ../gcc-${ver}/configure \ --prefix=/usr \ @@ -646,9 +641,9 @@ do_install() { ln -sf libgnat-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so rm -vf ${DESTDIR}/${adalib}/libgna{rl,t}.so - # If libquadmath was forced (needed for gfortran on some platforms) - # then remove it because it conflicts with libquadmath package - rm -rf ${DESTDIR}/${sysroot}/usr/lib/libquadmath.* + # Remove libgomp library because it conflicts with libgomp and + # libgomp-devel packages + rm -f ${DESTDIR}/usr/lib/libgomp* # Remove libdep linker plugin because it conflicts with system binutils rm -f ${DESTDIR}/usr/lib/bfd-plugins/libdep* |