From a9699e7fc01ab417ef2e65db8c668d81b54ec342 Mon Sep 17 00:00:00 2001
From: Stephen Sachs <stesachs@amazon.com>
Date: Tue, 9 Apr 2024 11:46:31 +0200
Subject: [PATCH] Disable those packages that won't build

---
 .../stacks/aws-pcluster-neoverse_v1/spack.yaml              | 6 ++++--
 .../stacks/aws-pcluster-x86_64_v4/packages.yaml             | 6 ++++++
 .../stacks/aws-pcluster-x86_64_v4/spack.yaml                | 5 ++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
index 91f45887324..21001895490 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml
@@ -4,9 +4,11 @@ spack:
   definitions:
   - apps:
     - gromacs
-    - mpas-model
+    # - mpas-model: Spack currently forces REAL(8) when using GCC. This conflicts with `precision=single`
+    # Fix proposed in https://github.com/spack/spack/pull/43547
     - openfoam
-    - quantum-espresso
+    # - quantum-espresso : %gcc@12.3.0 on neoverse_v1 fails.
+    # Root cause: internal compiler error: in compute_live_loop_exits, at tree-ssa-loop-manip.cc:247
     - wrf
 
   - targets:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml
index 2684b27f4a7..98623f19a0a 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml
@@ -6,6 +6,12 @@ packages:
           - "cflags=-std=c18 target=x86_64_v4"
           - "cflags=-std=c18 target=x86_64_v3"
           - "%gcc"
+  gettext:
+    require:
+      - one_of:
+          - '%intel cflags="-std=c18"'
+          - '%gcc'
+        message: "gettext uses single valued `static_assert` which is only available in `icc` as part of later C standard."
   gromacs:
     require:
       - one_of:
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
index a2b2e657b49..bac842e72ca 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml
@@ -5,11 +5,10 @@ spack:
   - apps:
     - gromacs
     - lammps
-    # - mpas-model: Spack currently forces REAL(8) when using GCC. This conflicts with `precision=single`
+    - mpas-model
     - openfoam
     - palace
-    # - quantum-espresso : %gcc@12.3.0 on neoverse_v1 fails.
-    # Root cause: internal compiler error: in compute_live_loop_exits, at tree-ssa-loop-manip.cc:247
+    - quantum-espresso
     # - wrf : While building hdf5 cmake errors out with Detecting Fortran/C Interface: Failed to compile
     # Root cause: ifort cannot deal with arbitrarily long file names.