zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paraview: fix range of exodusII-netcdf4.9.0.patch (#42926)

Browse Source 
Co-authored-by: Gava, Francesco <francesco.gava@mclaren.com>
This commit is contained in:
fgava90 2024-03-23 19:33:20 +00:00 committed by GitHub
parent e036cd9ef6
commit 218693431c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/paraview/package.py
View File

@ -209,6 +209,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
depends_on("expat") depends_on("expat")
depends_on("eigen@3:") depends_on("eigen@3:")
depends_on("freetype") depends_on("freetype")
depends_on("freetype@:2.10.2", when="@:5.8")
# depends_on('hdf5+mpi', when='+mpi') # depends_on('hdf5+mpi', when='+mpi')
# depends_on('hdf5~mpi', when='~mpi') # depends_on('hdf5~mpi', when='~mpi')
depends_on("hdf5+hl+mpi", when="+hdf5+mpi") depends_on("hdf5+hl+mpi", when="+hdf5+mpi")
@ -236,8 +237,10 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
depends_on("protobuf@3.4:3.18", when="@:5.10%xl") depends_on("protobuf@3.4:3.18", when="@:5.10%xl")
depends_on("protobuf@3.4:3.18", when="@:5.10%xl_r") depends_on("protobuf@3.4:3.18", when="@:5.10%xl_r")
# protobuf requires newer abseil-cpp, which in turn requires C++14, # protobuf requires newer abseil-cpp, which in turn requires C++14,
# but paraview uses C++11 by default. Use for 5.11+ until ParaView updates # but paraview uses C++11 by default. Use for 5.8+ until ParaView updates
# its C++ standard level. # its C++ standard level.
depends_on("protobuf@3.4:3.21", when="@5.8:%gcc")
depends_on("protobuf@3.4:3.21", when="@5.8:%clang")
depends_on("protobuf@3.4:3.21", when="@5.11:") depends_on("protobuf@3.4:3.21", when="@5.11:")
depends_on("protobuf@3.4:3.21", when="@master") depends_on("protobuf@3.4:3.21", when="@master")
depends_on("libxml2") depends_on("libxml2")
@ -288,7 +291,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
patch("vtkm-findmpi-downstream.patch", when="@5.9.0") patch("vtkm-findmpi-downstream.patch", when="@5.9.0")
# Include limits header wherever needed to fix compilation with GCC 11 # Include limits header wherever needed to fix compilation with GCC 11
patch("paraview-gcc11-limits.patch", when="@5.9.1 %gcc@11.1.0:") patch("paraview-gcc11-limits.patch", when="@5.8:5.9 %gcc@11.1.0:")
# Fix IOADIOS2 module to work with kits # Fix IOADIOS2 module to work with kits
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653
@ -301,10 +304,11 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
# intel oneapi doesn't compile some code in catalyst # intel oneapi doesn't compile some code in catalyst
patch("catalyst-etc_oneapi_fix.patch", when="@5.10.0:5.10.1%oneapi") patch("catalyst-etc_oneapi_fix.patch", when="@5.10.0:5.10.1%oneapi")
# Patch for paraview 5.10: +hdf5 ^hdf5@1.13.2: # Patch for paraview 5.8: ^hdf5@1.13.2:
# Even with ~hdf5, hdf5 is part of the dependency tree due to netcdf-c
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9690 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9690
patch("vtk-xdmf2-hdf51.13.1.patch", when="@5.10.0:5.10") patch("vtk-xdmf2-hdf51.13.1.patch", when="@5.8:5.10")
patch("vtk-xdmf2-hdf51.13.2.patch", when="@5.10:5.11.0") patch("vtk-xdmf2-hdf51.13.2.patch", when="@5.8:5.11.0")
# Fix VTK to work with external freetype using CONFIG mode for find_package # Fix VTK to work with external freetype using CONFIG mode for find_package
patch("FindFreetype.cmake.patch", when="@5.10.1:") patch("FindFreetype.cmake.patch", when="@5.10.1:")
@ -313,7 +317,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10113 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10113
patch("adios2-remove-deprecated-functions.patch", when="@5.10:5.11 ^adios2@2.9:") patch("adios2-remove-deprecated-functions.patch", when="@5.10:5.11 ^adios2@2.9:")
patch("exodusII-netcdf4.9.0.patch", when="@:5.10.2") patch("exodusII-netcdf4.9.0.patch", when="@5.10.0:5.10.2")
generator("ninja", "make", default="ninja") generator("ninja", "make", default="ninja")
# https://gitlab.kitware.com/paraview/paraview/-/issues/21223 # https://gitlab.kitware.com/paraview/paraview/-/issues/21223
@ -368,6 +372,7 @@ def flag_handler(self, name, flags):
elif self.spec.satisfies("@5.10: +hdf5"): elif self.spec.satisfies("@5.10: +hdf5"):
if self.spec["hdf5"].satisfies("@1.12:"): if self.spec["hdf5"].satisfies("@1.12:"):
flags.append("-DH5_USE_110_API") flags.append("-DH5_USE_110_API")
return (flags, None, None) return (flags, None, None)
def setup_run_environment(self, env): def setup_run_environment(self, env):