diff options
| author | fgava90 <68648009+fgava90@users.noreply.github.com> | 2024-03-23 19:33:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-23 20:33:20 +0100 |
| commit | 218693431c9a28f6cb7281af234e2cc1aad47017 (patch) | |
| tree | fe5ea17614f33dc333981bc9c2dcf25f20eb429e /var | |
| parent | e036cd9ef6ff57c3e98d4bdd9ae7b1fbde12d298 (diff) | |
| download | spack-218693431c9a28f6cb7281af234e2cc1aad47017.tar.gz spack-218693431c9a28f6cb7281af234e2cc1aad47017.tar.bz2 spack-218693431c9a28f6cb7281af234e2cc1aad47017.tar.xz spack-218693431c9a28f6cb7281af234e2cc1aad47017.zip | |
paraview: fix range of exodusII-netcdf4.9.0.patch (#42926)
Co-authored-by: Gava, Francesco <francesco.gava@mclaren.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index f89080f8cf..79f2e847c3 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -209,6 +209,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("expat") depends_on("eigen@3:") 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+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_r") # 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. + 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="@master") depends_on("libxml2") @@ -288,7 +291,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): patch("vtkm-findmpi-downstream.patch", when="@5.9.0") # 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 # 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 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 - patch("vtk-xdmf2-hdf51.13.1.patch", when="@5.10.0:5.10") - patch("vtk-xdmf2-hdf51.13.2.patch", when="@5.10:5.11.0") + patch("vtk-xdmf2-hdf51.13.1.patch", when="@5.8:5.10") + 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 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 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") # https://gitlab.kitware.com/paraview/paraview/-/issues/21223 @@ -368,6 +372,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): elif self.spec.satisfies("@5.10: +hdf5"): if self.spec["hdf5"].satisfies("@1.12:"): flags.append("-DH5_USE_110_API") + return (flags, None, None) def setup_run_environment(self, env): |