From a9caba346620846eba20fa31e8944a63ffa5a55b Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 10:19:51 +0200 Subject: [PATCH 1/5] {2023.06}[foss/2021b] OpenFoam v2112 --- eessi-2023.06-eb-4.8.0-2021b.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 eessi-2023.06-eb-4.8.0-2021b.yml diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml new file mode 100644 index 0000000000..b2202b5e7d --- /dev/null +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -0,0 +1,2 @@ +easyconfigs: + - OpenFOAM-v2112-foss-2021b.eb From 1df48dcd78e3c166835c4b47bf70a4ee46ec2f5f Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 10:24:45 +0200 Subject: [PATCH 2/5] add new easystack file --- .github/workflows/test_eessi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 7667d02c26..dba7403901 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -27,6 +27,7 @@ jobs: - eessi-2023.06-eb-4.7.2-2022b.yml - eessi-2023.06-eb-4.7.2-system.yml - eessi-2023.06-eb-4.8.0-system.yml + - eessi-2023.06-eb-4.8.0-2021b.yml steps: - name: Check out software-layer repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 From 8c057bc7376d4ce201849262e0fa2a1da65104df Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 12:48:58 +0200 Subject: [PATCH 3/5] include patch for tsprintf.c --- eessi-2023.06-eb-4.8.0-2021b.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index b2202b5e7d..ea32b3acbb 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -1,2 +1,6 @@ easyconfigs: - - OpenFOAM-v2112-foss-2021b.eb + - OpenFOAM-v2112-foss-2021b.eb: + #fix for different output of tsprintf.c test from GNU C library <2.36 + #see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 + options: + from-pr: 18746 From 39eda7ba930570afef702cc834632b99422cd403 Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 13:12:32 +0200 Subject: [PATCH 4/5] include patch for tsprintf.c --- eessi-2023.06-eb-4.8.0-2021b.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index ea32b3acbb..ff15917797 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -1,6 +1,7 @@ easyconfigs: - - OpenFOAM-v2112-foss-2021b.eb: + - MPFR-4.1.0-GCCcore-11.2.0.eb: #fix for different output of tsprintf.c test from GNU C library <2.36 #see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 options: from-pr: 18746 + - OpenFOAM-v2112-foss-2021b.eb From e0fe6b5c26cd9eb0442ffa5a0496d9d422f04090 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Sep 2023 12:29:40 +0200 Subject: [PATCH 5/5] improve comment for use of --from-pr for MPFR 4.1.0 --- eessi-2023.06-eb-4.8.0-2021b.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index ff15917797..477ba6320c 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -1,7 +1,7 @@ easyconfigs: - MPFR-4.1.0-GCCcore-11.2.0.eb: - #fix for different output of tsprintf.c test from GNU C library <2.36 - #see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 + # use patch for MPFR 4.1.0 to fix failing tsprintf test with glibc >= 2.37, + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 options: from-pr: 18746 - OpenFOAM-v2112-foss-2021b.eb