diff --git a/eb_hooks.py b/eb_hooks.py index 81fbfc62..55c8e15d 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -38,6 +38,7 @@ CPU_TARGET_AARCH64_GENERIC = 'aarch64/generic' CPU_TARGET_A64FX = 'aarch64/a64fx' CPU_TARGET_NVIDIA_GRACE = 'aarch64/nvidia/grace' +CPU_TARGET_AWS_GRAVITON4 = 'aarch64/aws/graviton4' CPU_TARGET_CASCADELAKE = 'x86_64/intel/cascadelake' CPU_TARGET_ICELAKE = 'x86_64/intel/icelake' @@ -688,7 +689,10 @@ def parse_hook_qt6_libinput(ec, eprefix): Add dependency on libinput to Qt6. This is not included in upstream EasyBuild as it brings a dependency on system-d """ - qt6_toolchain_version_to_libinput_version_map = {'14.3.0': '1.30.1'} + qt6_toolchain_version_to_libinput_version_map = { + '14.3.0': '1.30.1', + '15.2.0': '1.31.3', + } if ec.name == 'Qt6': # Only enforcing from GCCcore 14.3.0 onwards for Qt6 6.9.3 onwards if ec.toolchain.version >= LooseVersion('14.3.0'): @@ -2498,6 +2502,7 @@ def set_maximum(parallel, max_value): 'Qt6': { CPU_TARGET_A64FX: (set_maximum, 8), CPU_TARGET_AARCH64_GENERIC: (divide_by_factor, 2), + CPU_TARGET_AWS_GRAVITON4: (divide_by_factor, 2), CPU_TARGET_NEOVERSE_N1: (divide_by_factor, 2), CPU_TARGET_NEOVERSE_V1: (divide_by_factor, 2), },