diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2022-09-01 13:41:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 11:41:20 -0700 |
| commit | 117b0af831f1be8bdce1ee740a8ddde4b2a1362a (patch) | |
| tree | df1a050efaba1e94dba3639742c926953306bd1a /var | |
| parent | 2968ae667f62f859f42d08897b0bca273265158d (diff) | |
| download | spack-117b0af831f1be8bdce1ee740a8ddde4b2a1362a.tar.gz spack-117b0af831f1be8bdce1ee740a8ddde4b2a1362a.tar.bz2 spack-117b0af831f1be8bdce1ee740a8ddde4b2a1362a.tar.xz spack-117b0af831f1be8bdce1ee740a8ddde4b2a1362a.zip | |
Backport fix for buliding vtk-m diy with GCC 11 (#32465)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk-m/diy-include-cstddef.patch | 24 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk-m/package.py | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/vtk-m/diy-include-cstddef.patch b/var/spack/repos/builtin/packages/vtk-m/diy-include-cstddef.patch new file mode 100644 index 0000000000..20b072be74 --- /dev/null +++ b/var/spack/repos/builtin/packages/vtk-m/diy-include-cstddef.patch @@ -0,0 +1,24 @@ +From 671217ebdd89fa6b43bb990e0aaaf87dd57a0c5c Mon Sep 17 00:00:00 2001 +From: Ryan Krattiger <ryan.krattiger@kitware.com> +Date: Wed, 31 Aug 2022 13:58:21 -0400 +Subject: [PATCH] DIY: Add include of cstddef to DIY datatypes.hpp + +This is required because size_t is not defined via +the STL headers included here. +--- + vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/datatypes.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/datatypes.hpp b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/datatypes.hpp +index 24d4b3275..bec4a62d8 100644 +--- a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/datatypes.hpp ++++ b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/datatypes.hpp +@@ -5,6 +5,7 @@ + + #include <vector> + #include <array> ++#include <cstddef> + + namespace diy + { +-- diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py index d99e0a1439..a8abfefdf2 100644 --- a/var/spack/repos/builtin/packages/vtk-m/package.py +++ b/var/spack/repos/builtin/packages/vtk-m/package.py @@ -130,6 +130,9 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage): conflicts("+cuda", when="cuda_arch=none", msg="vtk-m +cuda requires that cuda_arch be set") + # Patch + patch("diy-include-cstddef.patch", when="@1.5.3:1.8.0") + def cmake_args(self): spec = self.spec options = [] |