diff --git a/var/spack/repos/builtin/packages/umpire/camp_resource.patch b/var/spack/repos/builtin/packages/umpire/camp_resource.patch new file mode 100644 index 00000000000..f42cceae100 --- /dev/null +++ b/var/spack/repos/builtin/packages/umpire/camp_resource.patch @@ -0,0 +1,26 @@ +diff --git a/src/umpire/ResourceManager.hpp b/src/umpire/ResourceManager.hpp +index 168655c..a04240a 100644 +--- a/src/umpire/ResourceManager.hpp ++++ b/src/umpire/ResourceManager.hpp +@@ -13,6 +13,8 @@ + #include + #include + #include ++#include ++#include + + #include "camp/resource.hpp" + #include "umpire/Allocator.hpp" +diff --git a/src/umpire/op/MemoryOperation.hpp b/src/umpire/op/MemoryOperation.hpp +index d5888ed..3b11607 100644 +--- a/src/umpire/op/MemoryOperation.hpp ++++ b/src/umpire/op/MemoryOperation.hpp +@@ -8,6 +8,8 @@ + #define UMPIRE_MemoryOperation_HPP + + #include ++#include ++#include + + #include "camp/resource.hpp" + #include "umpire/util/AllocationRecord.hpp" diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index e97db334dcf..1387476a1b0 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -128,8 +128,9 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): patch("camp_target_umpire_3.0.0.patch", when="@3.0.0") patch("cmake_version_check.patch", when="@4.1") patch("missing_header_for_numeric_limits.patch", when="@4.1:5.0.1") - - # export targets when building pre-6.0.0 release with BLT 0.4.0+ + patch("camp_resource.patch", when="@2022.10.0 %gcc@13 ^camp@2022.10.1") + + # exportlibexec/llvm targets when building pre-6.0.0 release with BLT 0.4.0+ patch( "https://github.com/LLNL/Umpire/commit/5773ce9af88952c8d23f9bcdcb2e503ceda40763.patch?full_index=1", sha256="f3b21335ce5cf9c0fecc852a94dfec90fb5703032ac97f9fee104af9408d8899",