Skip to content

Commit f850991

Browse files
authored
Merge pull request #1061 from trz42/2023.06-a64fx-2023b-eb490-apps-2
{2023.06}[2023b,a64fx] Qt5 5.15.13
2 parents b77f4be + 3ffb3a8 commit f850991

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,10 @@ easyconfigs:
8080
- OpenJPEG-2.5.0-GCCcore-13.2.0.eb
8181
- libwebp-1.3.2-GCCcore-13.2.0.eb
8282
- Wayland-1.22.0-GCCcore-13.2.0.eb
83-
# building nodejs (dependency of Qt5) failed in a first attempt, so we build the
84-
# other packages and pick that up later
85-
## originally built with EB 4.9.0, PR was included since EB 4.9.1
86-
## - Qt5-5.15.13-GCCcore-13.2.0.eb:
87-
## options:
88-
## # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20201
89-
## from-pr: 20201
90-
# - Qt5-5.15.13-GCCcore-13.2.0.eb
9183
- OSU-Micro-Benchmarks-7.2-gompi-2023b.eb
84+
# originally built with EB 4.9.0, PR was included since EB 4.9.1
85+
# - Qt5-5.15.13-GCCcore-13.2.0.eb:
86+
# options:
87+
# # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20201
88+
# from-pr: 20201
89+
- Qt5-5.15.13-GCCcore-13.2.0.eb

eb_hooks.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,6 +1280,9 @@ def set_maximum(parallel, max_value):
12801280
'*': (divide_by_factor, 2),
12811281
CPU_TARGET_A64FX: (set_maximum, 12),
12821282
},
1283+
'nodejs': {
1284+
CPU_TARGET_A64FX: (divide_by_factor, 2),
1285+
},
12831286
'MBX': {
12841287
'*': (divide_by_factor, 2),
12851288
},
@@ -1288,7 +1291,7 @@ def set_maximum(parallel, max_value):
12881291
CPU_TARGET_A64FX: (set_maximum, 8),
12891292
},
12901293
'Qt5': {
1291-
CPU_TARGET_A64FX: (divide_by_factor, 2),
1294+
CPU_TARGET_A64FX: (set_maximum, 8),
12921295
},
12931296
'ROOT': {
12941297
CPU_TARGET_A64FX: (divide_by_factor, 2),

0 commit comments

Comments
 (0)