rpms/vtk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop ninja build; Allow RPATH style 10

Browse Source
This commit is contained in:
Orion Poplawski 2022-01-31 19:30:43 -07:00
parent ffa6c39e9e
commit 10827ac247
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vtk.spec
View File

@ -52,15 +52,9 @@ Patch3: vtk-AllValues.patch
URL: https://vtk.org/ URL: https://vtk.org/
BuildRequires: cmake BuildRequires: cmake
# Fails with make on x86_64 for some reason, but otherwise make appears to be faster # Allow for testing with different cmake generators.
# and ninja seems to fail on ppc64le # make still seems to be faster than ninja, but has failed at times.
# https://gitlab.kitware.com/vtk/vtk/-/issues/18394
%ifarch x86_64
BuildRequires: ninja-build
%global cmake_gen -GNinja
%else
%global cmake_gen %{nil} %global cmake_gen %{nil}
%endif
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%{?with_java:BuildRequires: java-devel} %{?with_java:BuildRequires: java-devel}
%if %{with flexiblas} %if %{with flexiblas}
@ -677,7 +671,10 @@ cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/
# 0x0008 ... the special '$ORIGIN' RPATHs are appearing after other # 0x0008 ... the special '$ORIGIN' RPATHs are appearing after other
# RPATHs; this is just a minor issue but usually unwanted # RPATHs; this is just a minor issue but usually unwanted
# The paths are equivalent and "this is just a minor issue", so we are allowing it below # The paths are equivalent and "this is just a minor issue", so we are allowing it below
export QA_RPATHS=8 # 0x0010 ... the RPATH is empty; there is no reason for such RPATHs
# and they cause unneeded work while loading libraries
# This is appearing on mpi libraries, no idea why.
export QA_RPATHS=18
%check %check