From 4cb64e150f1244c4ae8c229b4b0ec0def3b2ea21 Mon Sep 17 00:00:00 2001 From: Jon Rood Date: Tue, 8 Apr 2025 14:02:41 -0600 Subject: [PATCH] trilinos: patch stk to include cstddef for size_t error (#49952) * trilinos: patch stk to include cstddef for size_t error * Update comment. --- .../packages/trilinos/16-1-0-stk-size_t.patch | 19 +++++++++++++++++++ .../builtin/packages/trilinos/package.py | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 var/spack/repos/builtin/packages/trilinos/16-1-0-stk-size_t.patch diff --git a/var/spack/repos/builtin/packages/trilinos/16-1-0-stk-size_t.patch b/var/spack/repos/builtin/packages/trilinos/16-1-0-stk-size_t.patch new file mode 100644 index 00000000000..9a1cc0dfddc --- /dev/null +++ b/var/spack/repos/builtin/packages/trilinos/16-1-0-stk-size_t.patch @@ -0,0 +1,19 @@ +diff --git a/packages/stk/stk_util/stk_util/parallel/ReceiveCounter.hpp b/packages/stk/stk_util/stk_util/parallel/ReceiveCounter.hpp +index ad1232b5bf7..daf3329969b 100644 +--- a/packages/stk/stk_util/stk_util/parallel/ReceiveCounter.hpp ++++ b/packages/stk/stk_util/stk_util/parallel/ReceiveCounter.hpp +@@ -36,6 +36,7 @@ + #define stk_util_parallel_ReceiveCounter_hpp + + #include ++#include + + #include "stk_util/parallel/Parallel.hpp" // for MPI + +@@ -92,4 +93,4 @@ std::vector get_send_counts(std::vector< std::vector > sendLists, size_ + } + + } // namespace +-#endif +\ No newline at end of file ++#endif diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 7b5483f3142..46f00d18b7c 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -559,6 +559,10 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): # https://github.com/trilinos/Trilinos/pull/13921 patch("16-1-0-stk-fpe-exceptions.patch", when="@=16.1.0 +stk platform=darwin") + # https://github.com/trilinos/Trilinos/issues/13916 and + # https://github.com/trilinos/Trilinos/pull/13921 + patch("16-1-0-stk-size_t.patch", when="@=16.1.0 +stk") + def flag_handler(self, name, flags): spec = self.spec is_cce = spec.satisfies("%cce")