diff options
| author | Dan Lipsa <dan.lipsa@kitware.com> | 2023-06-07 15:20:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 14:20:27 -0500 |
| commit | 79656655ba82b9bfb903b23e7de0d262a09bcf2d (patch) | |
| tree | ca51db32fe8ccf5f6c0f9803bfe1edc76c4d5db1 | |
| parent | 74921788a86d8214a3817d73baf4bd20899d67c6 (diff) | |
| download | spack-79656655ba82b9bfb903b23e7de0d262a09bcf2d.tar.gz spack-79656655ba82b9bfb903b23e7de0d262a09bcf2d.tar.bz2 spack-79656655ba82b9bfb903b23e7de0d262a09bcf2d.tar.xz spack-79656655ba82b9bfb903b23e7de0d262a09bcf2d.zip | |
Guard for define in netcdf 4.9.0 and later. (#37853)
* Guard for define in netcdf 4.9.0 and later.
This code is already available in ParaView 5.11.0 so no patching
needed there.
* Add latest needed version (even if not in spack).
---------
Co-authored-by: Dan Lipsa <dan.lipsa@khq.kitware.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/exodusII-netcdf4.9.0.patch | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/exodusII-netcdf4.9.0.patch b/var/spack/repos/builtin/packages/paraview/exodusII-netcdf4.9.0.patch new file mode 100644 index 0000000000..ec90224277 --- /dev/null +++ b/var/spack/repos/builtin/packages/paraview/exodusII-netcdf4.9.0.patch @@ -0,0 +1,14 @@ +*** a/VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2023-03-16 16:57:14.172102586 -0400 +--- b/VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c 2023-03-16 11:20:28.230116660 -0400 +*************** +*** 1770,1776 **** +--- 1770,1778 ---- + */ + + /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ ++ #ifndef NC_SZIP_NN + const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ ++ #endif + /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ + const int SZIP_PIXELS_PER_BLOCK = + file->compression_level == 0 ? 32 : file->compression_level; diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 312abed8f3..619d7a9ec0 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -295,6 +295,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10113 patch("adios2-remove-deprecated-functions.patch", when="@5.10: ^adios2@2.9:") + patch("exodusII-netcdf4.9.0.patch", when="@:5.10.2") + generator("ninja", "make", default="ninja") # https://gitlab.kitware.com/paraview/paraview/-/issues/21223 conflicts("generator=ninja", when="%xl") |