Skip to content

Commit cbb9f15

Browse files
authored
Merge pull request #284 from TopRichard/eessi-2023.06-Qt5/5.15.2
{2023.06}[foss/2021a] Qt5 V5.15.2
2 parents 6f25afd + ca7e368 commit cbb9f15

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

eb_hooks.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,19 @@ def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
176176
raise EasyBuildError("OpenBLAS-specific hook triggered for non-OpenBLAS easyconfig?!")
177177

178178

179+
def parse_hook_qt5_check_qtwebengine_disable(ec, eprefix):
180+
"""
181+
Disable check for QtWebEngine in Qt5 as workaround for problem with determining glibc version.
182+
"""
183+
if ec.name == 'Qt5':
184+
# workaround for glibc version being reported as "UNKNOWN" in Gentoo Prefix environment by EasyBuild v4.7.2,
185+
# see also https://github.com/easybuilders/easybuild-framework/pull/4290
186+
ec['check_qtwebengine'] = False
187+
print_msg("Checking for QtWebEgine in Qt5 installation has been disabled")
188+
else:
189+
raise EasyBuildError("Qt5-specific hook triggered for non-Qt5 easyconfig?!")
190+
191+
179192
def parse_hook_ucx_eprefix(ec, eprefix):
180193
"""Make UCX aware of compatibility layer via additional configuration options."""
181194
if ec.name == 'UCX':
@@ -250,6 +263,7 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
250263
'CGAL': parse_hook_cgal_toolchainopts_precise,
251264
'fontconfig': parse_hook_fontconfig_add_fonts,
252265
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
266+
'Qt5': parse_hook_qt5_check_qtwebengine_disable,
253267
'UCX': parse_hook_ucx_eprefix,
254268
}
255269

eessi-2023.06-eb-4.7.2-2021a.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ easyconfigs:
88
- libjpeg-turbo-2.0.6-GCCcore-10.3.0.eb
99
- QuantumESPRESSO-6.7-foss-2021a.eb
1010
- GROMACS-2021.3-foss-2021a.eb
11+
- Qt5-5.15.2-GCCcore-10.3.0.eb:
12+
# add missing patch files for Qt5 5.15.2 to fix build problems with glibc 2.34,
13+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/18087
14+
options:
15+
from-pr: 18087

0 commit comments

Comments
 (0)