Merge pull request #2162 from terjekv/aarch64_support_for_openfoam_v2

fix OpenFOAM easyblock to support installation on Arm/aarch64 systems
easybuilders · Sep 7, 2020 · f50a85d · f50a85d
2 parents b31be29 + 3e41455
commit f50a85d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/easybuild/easyblocks/o/openfoam.py b/easybuild/easyblocks/o/openfoam.py
@@ -50,7 +50,7 @@
 from easybuild.tools.filetools import adjust_permissions, apply_regex_substitutions, mkdir
 from easybuild.tools.modules import get_software_root, get_software_version
 from easybuild.tools.run import run_cmd, run_cmd_qa
-from easybuild.tools.systemtools import get_shared_lib_ext
+from easybuild.tools.systemtools import get_shared_lib_ext, get_cpu_architecture, AARCH64
 
 
 class EB_OpenFOAM(EasyBlock):
@@ -364,7 +364,15 @@ def sanity_check_step(self):
         else:
             int_size = ''
 
-        psubdir = "linux64%sDP%s%s" % (self.wm_compiler, int_size, self.build_type)
+        archpart = '64'
+        if get_cpu_architecture() == AARCH64:
+            # Variants have different abbreviations for ARM64...
+            if self.looseversion < LooseVersion("100"):
+                archpart = 'Arm64'
+            else:
+                archpart = 'ARM64'
+
+        psubdir = "linux%s%sDP%s%s" % (archpart, self.wm_compiler, int_size, self.build_type)
 
         openfoam_extend_v3 = 'extend' in self.name.lower() and self.looseversion >= LooseVersion('3.0')
         if openfoam_extend_v3 or self.looseversion < LooseVersion("2"):