From 52bc7039f2ede4c61c8f559f7cd6d55136c62d0a Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Mon, 7 Nov 2022 09:00:04 +0100
Subject: [PATCH 1/3] add OpenFOAM v9 installation to EESSI pilot 2021.12

---
 EESSI-pilot-install-software.sh | 6 ++++++
 eessi-2021.12.yml               | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 5e3f4c8ee2..6331caa0cc 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -356,6 +356,12 @@ fail_msg="Installation of WRF failed, that's unexpected..."
 OMPI_MCA_pml=ucx UCX_TLS=tcp $EB WRF-3.9.1.1-foss-2020a-dmpar.eb -r --include-easyblocks-from-pr 2648
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
+echo ">> Installing OpenFOAM 9..."
+ok_msg="Yet another variant of OpenFOAM is installed!"
+fail_msg="Installation of OpenFOAM failed, yikes..."
+$EB OpenFOAM-9-foss-2021a.eb -r
+check_exit_code $? "${ok_msg}" "${fail_msg}"
+
 ### add packages here
 
 echo ">> Creating/updating Lmod cache..."
diff --git a/eessi-2021.12.yml b/eessi-2021.12.yml
index f3ed9dd9c4..aca71d00df 100644
--- a/eessi-2021.12.yml
+++ b/eessi-2021.12.yml
@@ -23,6 +23,8 @@ software:
     toolchains:
       foss-2020a:
         versions: ['8', 'v2006']
+      foss-2021a:
+        versions: '9'
   OSU-Micro-Benchmarks:
      toolchains:
        gompi-2020a:

From a891ce0335de6845551691f915401496e0616a55 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Mon, 7 Nov 2022 11:17:26 +0100
Subject: [PATCH 2/3] install X11 with GCCcore/10.3.0 toolchain from PR 14821
 to fix build error due to implicit declaration of function strlcpy

---
 EESSI-pilot-install-software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 6331caa0cc..472a9ea196 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -359,7 +359,7 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing OpenFOAM 9..."
 ok_msg="Yet another variant of OpenFOAM is installed!"
 fail_msg="Installation of OpenFOAM failed, yikes..."
-$EB OpenFOAM-9-foss-2021a.eb -r
+$EB --from-pr 14821 X11-20210518-GCCcore-10.3.0.eb -r && $EB OpenFOAM-9-foss-2021a.eb -r
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
 ### add packages here

From 8c61b83ef6d168bb5f131c3c5aee59f5fc11cddb Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Mon, 7 Nov 2022 17:33:51 +0100
Subject: [PATCH 3/3] install HarfBuzz + NSS with GCCcore/10.3.0 via PR that
 fixes build problems

---
 EESSI-pilot-install-software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 472a9ea196..220bd9a492 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -359,7 +359,7 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing OpenFOAM 9..."
 ok_msg="Yet another variant of OpenFOAM is installed!"
 fail_msg="Installation of OpenFOAM failed, yikes..."
-$EB --from-pr 14821 X11-20210518-GCCcore-10.3.0.eb -r && $EB OpenFOAM-9-foss-2021a.eb -r
+$EB --from-pr 14821 X11-20210518-GCCcore-10.3.0.eb -r && $EB --from-pr 16570 HarfBuzz-2.8.1-GCCcore-10.3.0.eb -r && eb --from-pr 16571 NSS-3.65-GCCcore-10.3.0.eb -r && $EB OpenFOAM-9-foss-2021a.eb -r
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
 ### add packages here