Skip to content

Commit b94e7c1

Browse files
authored
Merge pull request #13 from boegel/eessi-2023.06-Qt5/5.15.2
refactor parse hook for Qt5 to disable check_qtwebengine
2 parents c1c8e8e + 913ff53 commit b94e7c1

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

eb_hooks.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,9 @@ def parse_hook(ec, *args, **kwargs):
5959
# determine path to Prefix installation in compat layer via $EPREFIX
6060
eprefix = get_eessi_envvar('EPREFIX')
6161

62-
#Disable Qt5/5.15.2 qtwebengine in Sanity-check
63-
Qt5_check_qtwebengine_disable(ec, eprefix)
64-
6562
if ec.name in PARSE_HOOKS:
6663
PARSE_HOOKS[ec.name](ec, eprefix)
6764

68-
def Qt5_check_qtwebengine_disable(ec, eprefix):
69-
if ec.name == 'Qt5'and ec.version == '5.15.2':
70-
ec['check_qtwebengine'] = False
71-
print_msg("The value of check_qtwebengine has been set to %s", ec['check_qtwebengine'])
7265

7366
def pre_prepare_hook(self, *args, **kwargs):
7467
"""Main pre-prepare hook: trigger custom functions."""
@@ -166,6 +159,19 @@ def parse_hook_fontconfig_add_fonts(ec, eprefix):
166159
raise EasyBuildError("fontconfig-specific hook triggered for non-fontconfig easyconfig?!")
167160

168161

162+
def parse_hook_Qt5_check_qtwebengine_disable(ec, eprefix):
163+
"""
164+
Disable check for QtWebEngine in Qt5 as workaround for problem with determining glibc version.
165+
"""
166+
if ec.name == 'Qt5':
167+
# workaround for glibc version being reported as "UNKNOWN" in Gentoo Prefix environment by EasyBuild v4.7.2,
168+
# see also https://github.com/easybuilders/easybuild-framework/pull/4290
169+
ec['check_qtwebengine'] = False
170+
print_msg("Checking for QtWebEgine in Qt5 installation has been disabled")
171+
else:
172+
raise EasyBuildError("Qt5-specific hook triggered for non-Qt5 easyconfig?!")
173+
174+
169175
def parse_hook_ucx_eprefix(ec, eprefix):
170176
"""Make UCX aware of compatibility layer via additional configuration options."""
171177
if ec.name == 'UCX':
@@ -239,6 +245,7 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
239245
PARSE_HOOKS = {
240246
'CGAL': parse_hook_cgal_toolchainopts_precise,
241247
'fontconfig': parse_hook_fontconfig_add_fonts,
248+
'Qt5': parse_hook_Qt5_check_qtwebengine_disable,
242249
'UCX': parse_hook_ucx_eprefix,
243250
}
244251

0 commit comments

Comments
 (0)