From d15a1b7be0ec63b7091f3fa766a33f6bf11140dc Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Thu, 1 May 2025 14:06:51 +0200 Subject: [PATCH 1/3] {2023.06}[2023b,a64fx] Qt5 5.15.13 --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml index 84c03b0d20..a244ccd07e 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml @@ -80,12 +80,10 @@ easyconfigs: - OpenJPEG-2.5.0-GCCcore-13.2.0.eb - libwebp-1.3.2-GCCcore-13.2.0.eb - Wayland-1.22.0-GCCcore-13.2.0.eb -# building nodejs (dependency of Qt5) failed in a first attempt, so we build the -# other packages and pick that up later -## originally built with EB 4.9.0, PR was included since EB 4.9.1 -## - Qt5-5.15.13-GCCcore-13.2.0.eb: -## options: -## # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20201 -## from-pr: 20201 -# - Qt5-5.15.13-GCCcore-13.2.0.eb - OSU-Micro-Benchmarks-7.2-gompi-2023b.eb +# originally built with EB 4.9.0, PR was included since EB 4.9.1 +# - Qt5-5.15.13-GCCcore-13.2.0.eb: +# options: +# # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20201 +# from-pr: 20201 + - Qt5-5.15.13-GCCcore-13.2.0.eb From c88c12528a10ccaaa119165dd76faeaacd59122f Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 20 May 2025 11:25:09 +0200 Subject: [PATCH 2/3] use half the cores when building nodejs --- eb_hooks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index adf4600daa..abec518e94 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -1269,6 +1269,9 @@ def set_maximum(parallel, max_value): '*': (divide_by_factor, 2), CPU_TARGET_A64FX: (set_maximum, 12), }, + 'nodejs': { + CPU_TARGET_A64FX: (divide_by_factor, 2), + }, 'MBX': { '*': (divide_by_factor, 2), }, From 57180f0d02b1bbd620ab5ddbb5e90b8af139b253 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Thu, 22 May 2025 09:50:32 +0200 Subject: [PATCH 3/3] use at most 8 cores when building Qt5 --- eb_hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eb_hooks.py b/eb_hooks.py index abec518e94..ad32fd5319 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -1280,7 +1280,7 @@ def set_maximum(parallel, max_value): CPU_TARGET_A64FX: (set_maximum, 8), }, 'Qt5': { - CPU_TARGET_A64FX: (divide_by_factor, 2), + CPU_TARGET_A64FX: (set_maximum, 8), }, 'ROOT': { CPU_TARGET_A64FX: (divide_by_factor, 2),