From 0aedbfdcb33906869ecde5f6c339c41772c051f5 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Sep 2020 23:02:20 +0200 Subject: [PATCH] paraview: try fixing 32-bit builds, and update vtk libatomic bits --- srcpkgs/paraview/template | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 576bffd5847..76c4461098e 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -34,6 +34,7 @@ license="BSD-3-Clause" homepage="https://www.paraview.org" distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz" checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034 + CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon" CXXFLAGS="${CFLAGS}" @@ -48,20 +49,25 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -case "$XBPS_MACHINE" in - # TODO: is this necessary for other kinds of 32bit builders? - i686*) # XXX: this might be necessary if the i686 builder dies due to OOM - disable_parallel_build="https://build.voidlinux.org/builders/i686_builder/builds/27013/steps/shell_3/logs/stdio" - ;; -esac - post_extract() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - echo "target_link_libraries(vtkCommonDataModel PRIVATE atomic)" >> \ + echo "vtk_module_link(VTK::CommonDataModel PRIVATE atomic)" >> \ VTK/Common/DataModel/CMakeLists.txt fi } +pre_configure() { + # use smaller debug info for 32-bit targets + if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then + export CFLAGS="${CFLAGS/-g/-g1}" + export CXXFLAGS="${CXXFLAGS/-g/-g1}" + fi + # conserve linker memory on 32-bit hosts + if [ "$XBPS_WORDSIZE" = "32" ]; then + export LDFLAGS+=" -Wl,--no-keep-memory" + fi +} + _add_execinfo() { # contents of link.txt files need to be in a single line local content="$(cat $1) -lexecinfo "