diff --git a/eb_hooks.py b/eb_hooks.py index 25cc7bc02a..191e24678b 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -176,6 +176,19 @@ def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix): raise EasyBuildError("OpenBLAS-specific hook triggered for non-OpenBLAS easyconfig?!") +def parse_hook_qt5_check_qtwebengine_disable(ec, eprefix): + """ + Disable check for QtWebEngine in Qt5 as workaround for problem with determining glibc version. + """ + if ec.name == 'Qt5': + # workaround for glibc version being reported as "UNKNOWN" in Gentoo Prefix environment by EasyBuild v4.7.2, + # see also https://github.com/easybuilders/easybuild-framework/pull/4290 + ec['check_qtwebengine'] = False + print_msg("Checking for QtWebEgine in Qt5 installation has been disabled") + else: + raise EasyBuildError("Qt5-specific hook triggered for non-Qt5 easyconfig?!") + + def parse_hook_ucx_eprefix(ec, eprefix): """Make UCX aware of compatibility layer via additional configuration options.""" if ec.name == 'UCX': @@ -250,6 +263,7 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs): 'CGAL': parse_hook_cgal_toolchainopts_precise, 'fontconfig': parse_hook_fontconfig_add_fonts, 'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors, + 'Qt5': parse_hook_qt5_check_qtwebengine_disable, 'UCX': parse_hook_ucx_eprefix, } diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 223bfad6c4..c0fa353475 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -8,3 +8,8 @@ easyconfigs: - libjpeg-turbo-2.0.6-GCCcore-10.3.0.eb - QuantumESPRESSO-6.7-foss-2021a.eb - GROMACS-2021.3-foss-2021a.eb + - Qt5-5.15.2-GCCcore-10.3.0.eb: + # add missing patch files for Qt5 5.15.2 to fix build problems with glibc 2.34, + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18087 + options: + from-pr: 18087