From aff3fd8efd7089be2e69dd9e139b286c53913e48 Mon Sep 17 00:00:00 2001 From: Pasquale Claudio Africa Date: Sat, 28 Sep 2024 14:33:43 +0200 Subject: [PATCH] trilonos: Fix missing #include for gcc-13+ (#46165) --- .../packages/trilinos/cstdint_gcc13.patch | 33 +++++++++++++++++++ .../builtin/packages/trilinos/package.py | 1 + 2 files changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/trilinos/cstdint_gcc13.patch 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 00000000000..671720903a2 --- /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 + ++#include + #include + #include + +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 + #include + + /*! \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 + #include + + namespace Teuchos { diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index ce7f86cdf0c..b186834b8af 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(