From f5a70dece808a2b501952597b66943c3cc7f91f4 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Tue, 1 Feb 2022 03:18:48 -0800 Subject: ascent: add patch for gcc 10 + 11 (#28592) --- .../packages/ascent/ascent-gcc-11-pr753.patch | 21 +++++++++++++++++++++ var/spack/repos/builtin/packages/ascent/package.py | 7 +++++++ 2 files changed, 28 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ascent/ascent-gcc-11-pr753.patch diff --git a/var/spack/repos/builtin/packages/ascent/ascent-gcc-11-pr753.patch b/var/spack/repos/builtin/packages/ascent/ascent-gcc-11-pr753.patch new file mode 100644 index 0000000000..1aa3dd7a56 --- /dev/null +++ b/var/spack/repos/builtin/packages/ascent/ascent-gcc-11-pr753.patch @@ -0,0 +1,21 @@ +From 627b2eb21a0885f5ac2133aac00c1da3ecbfc083 Mon Sep 17 00:00:00 2001 +From: Charles Gueunet +Date: Mon, 7 Jun 2021 11:55:31 +0200 +Subject: [PATCH] Fix: missing include for G++11 + +--- + src/utilities/holo_compare/holo_compare.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utilities/holo_compare/holo_compare.cpp b/src/utilities/holo_compare/holo_compare.cpp +index 4b2f66eaf..c3b5c934e 100644 +--- a/src/utilities/holo_compare/holo_compare.cpp ++++ b/src/utilities/holo_compare/holo_compare.cpp +@@ -55,6 +55,7 @@ + #include + #include + #include ++#include + + void usage() + { diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 1a2034b972..b734eac345 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -89,6 +89,13 @@ class Ascent(CMakePackage, CudaPackage): # variant for BabelFlow runtime variant("babelflow", default=False, description="Build with BabelFlow") + ########################################################################## + # patches + ########################################################################### + # patch for gcc 10 and 11, changes already on develop, here + # so folks can build 0.7.1 with those compilers + patch("ascent-gcc-11-pr753.patch", when="@0.7.1") + ########################################################################## # package dependencies ########################################################################### -- cgit v1.2.3-70-g09d2