Merge pull request EESSI#336 from TopRichard/eessi-2023.06-WRF-dmpar/…

…4.4.1-foss/2022b

{2023.06}[foss/2022b] WRF-dmpar V4.4.1

eb_hooks.py

@@ -247,7 +247,6 @@ def pre_configure_hook_metabat_filtered_zlib_dep(self, *args, **kwargs):
     else:
         raise EasyBuildError("MetaBAT-specific hook triggered for non-MetaBAT easyconfig?!")
 
-
 def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
     """
     Pre-configure hook for WRF:
@@ -257,8 +256,13 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
         if get_cpu_architecture() == AARCH64:
             pattern = "Linux x86_64 ppc64le, gfortran"
             repl = "Linux x86_64 aarch64 ppc64le, gfortran"
-            self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl))
-            print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
+            if LooseVersion(self.version) <= LooseVersion('3.9.0'):
+                    self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl))
+                    print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
+
+            if LooseVersion('4.0.0') <= LooseVersion(self.version) <= LooseVersion('4.2.1'):
+                    self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure.defaults && " % (pattern, repl))
+                    print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
     else:
         raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!")
 

eessi-2023.06-eb-4.7.2-2022b.yml

@@ -5,3 +5,9 @@ easyconfigs:
       options:
         include-easyblocks-from-pr: 2248
   - foss-2022b
+  - 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
+  - WRF-4.4.1-foss-2022b-dmpar.eb