summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPasquale Claudio Africa <pafrica@sissa.it>2024-09-28 14:33:43 +0200
committerGitHub <noreply@github.com>2024-09-28 14:33:43 +0200
commitaff3fd8efd7089be2e69dd9e139b286c53913e48 (patch)
tree48f455751321a0c27c15c9577597671baceba18c
parent3bacced8610c1666e58e0a3ca41d6a6274d56f8d (diff)
downloadspack-aff3fd8efd7089be2e69dd9e139b286c53913e48.tar.gz
spack-aff3fd8efd7089be2e69dd9e139b286c53913e48.tar.bz2
spack-aff3fd8efd7089be2e69dd9e139b286c53913e48.tar.xz
spack-aff3fd8efd7089be2e69dd9e139b286c53913e48.zip
trilonos: Fix missing #include <cstdint> for gcc-13+ (#46165)
-rw-r--r--var/spack/repos/builtin/packages/trilinos/cstdint_gcc13.patch33
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py1
2 files changed, 34 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/cstdint_gcc13.patch b/var/spack/repos/builtin/packages/trilinos/cstdint_gcc13.patch
new file mode 100644
index 0000000000..671720903a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/trilinos/cstdint_gcc13.patch
@@ -0,0 +1,33 @@
+diff -Naur spack-src.orig/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp spack-src/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
+--- spack-src.orig/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp 2024-09-02 10:53:10.022724683 +0200
++++ spack-src/packages/kokkos/core/src/impl/Kokkos_MemoryPool.cpp 2024-09-02 10:57:03.312228742 +0200
+@@ -44,6 +44,7 @@
+
+ #include <impl/Kokkos_Error.hpp>
+
++#include <cstdint>
+ #include <ostream>
+ #include <sstream>
+
+diff -Naur spack-src.orig/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp spack-src/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
+--- spack-src.orig/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp 2024-09-02 10:53:50.098010896 +0200
++++ spack-src/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp 2024-09-02 10:51:17.777157344 +0200
+@@ -42,6 +42,7 @@
+ #ifndef TEUCHOS_BIG_UINT_DECL_HPP
+ #define TEUCHOS_BIG_UINT_DECL_HPP
+
++#include <cstdint>
+ #include <iosfwd>
+
+ /*! \file Teuchos_BigUIntDecl.hpp
+diff -Naur spack-src.orig/packages/teuchos/core/src/Teuchos_PrintDouble.cpp spack-src/packages/teuchos/core/src/Teuchos_PrintDouble.cpp
+--- spack-src.orig/packages/teuchos/core/src/Teuchos_PrintDouble.cpp 2024-09-02 10:54:02.240401775 +0200
++++ spack-src/packages/teuchos/core/src/Teuchos_PrintDouble.cpp 2024-09-02 10:51:34.110672927 +0200
+@@ -42,6 +42,7 @@
+ #include "Teuchos_PrintDouble.hpp"
+ #include "Teuchos_BigUInt.hpp"
+
++#include <cstdint>
+ #include <cstring>
+
+ namespace Teuchos {
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index ce7f86cdf0..b186834b8a 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -516,6 +516,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
"0001-use-the-gcnArchName-inplace-of-gcnArch-as-gcnArch-is.patch",
when="@15.0.0 ^hip@6.0 +rocm",
)
+ patch("cstdint_gcc13.patch", when="@13.4.0:13.4.1 %gcc@13.0.0:")
# Allow building with +teko gotype=long
patch(