From 3351f05dd462a70983588f4976501118465dd2e2 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Fri, 6 Oct 2023 22:22:35 +0200 Subject: [PATCH 1/3] {2023.06}[foss/2022a] add NCO/5.1.0 --- eessi-2023.06-eb-4.8.1-2022a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index b1bbe71da7..58b6864d81 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -8,3 +8,4 @@ easyconfigs: - gzip-1.12-GCCcore-11.3.0.eb - lz4-1.9.3-GCCcore-11.3.0.eb - zstd-1.5.2-GCCcore-11.3.0.eb + - NCO-5.1.0-foss-2022a.eb From 5935726294e83c8d8e5baf65b7072d1292ff6d2f Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Fri, 6 Oct 2023 22:57:47 +0200 Subject: [PATCH 2/3] use updated CMakeMake easyblock for netCDF --- eessi-2023.06-eb-4.8.1-2022a.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 58b6864d81..13f0383a88 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -8,4 +8,9 @@ easyconfigs: - gzip-1.12-GCCcore-11.3.0.eb - lz4-1.9.3-GCCcore-11.3.0.eb - zstd-1.5.2-GCCcore-11.3.0.eb + - netCDF-4.9.0-gompi-2022b.eb: + # use updated CMakeMake easyblock to avoid that -DCMAKE_SKIP_RPATH=ON is used, which breaks the netCDF test step + # see https://github.com/easybuilders/easybuild-easyblocks/pull/3012 + options: + include-easyblocks-from-pr: 3012 - NCO-5.1.0-foss-2022a.eb From 5fcf6f2df41e48a7f4dabb7cbbe52a3fe5b4bbc2 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Sat, 7 Oct 2023 08:03:13 +0200 Subject: [PATCH 3/3] build netCDF for 2022a (was 2022b) --- eessi-2023.06-eb-4.8.1-2022a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 13f0383a88..4a7243338f 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -8,7 +8,7 @@ easyconfigs: - gzip-1.12-GCCcore-11.3.0.eb - lz4-1.9.3-GCCcore-11.3.0.eb - zstd-1.5.2-GCCcore-11.3.0.eb - - netCDF-4.9.0-gompi-2022b.eb: + - netCDF-4.9.0-gompi-2022a.eb: # use updated CMakeMake easyblock to avoid that -DCMAKE_SKIP_RPATH=ON is used, which breaks the netCDF test step # see https://github.com/easybuilders/easybuild-easyblocks/pull/3012 options: