Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
82fe73e
{2023.06}[foss/2021a] Qt5 V5.15.2
Jun 27, 2023
f2b4ede
added --from-pr option
Jun 27, 2023
237a16f
added from-pr option
Jun 27, 2023
df8a57a
merging local with remote
Jun 30, 2023
7b9f662
adding the option:ignore-test-failure
Jun 30, 2023
5436f8b
removed the option:ignore-test-failure
Jun 30, 2023
386d7f8
Merge branch '2023.06' of https://github.com/EESSI/software-layer int…
Jul 4, 2023
2a32626
added a hook to set check_qtwebengine to False
Jul 4, 2023
a86d0e6
renamed the function in the hook to Qt5_check_qtwebengine_disable
Jul 4, 2023
c46d016
renamed the function in the hook to Qt5_check_qtwebengine_disable 1
Jul 4, 2023
9262538
editted the hook
Jul 4, 2023
c1c8e8e
editted the hook
Jul 4, 2023
22245d4
refactor parse hook for Qt5 to disable check_qtwebengine
boegel Jul 5, 2023
913ff53
raise error if Qt5-specific hook is triggered for something else than…
boegel Jul 5, 2023
b94e7c1
Merge pull request #13 from boegel/eessi-2023.06-Qt5/5.15.2
TopRichard Jul 5, 2023
ee36189
Merge branch '2023.06' of https://github.com/EESSI/software-layer int…
Jul 5, 2023
cdc2d78
Merge branch 'eessi-2023.06-Qt5/5.15.2' of gh-eessi:TopRichard/bot-so…
Jul 5, 2023
ca888ad
added some explanation in the eessi-2021a yml file
Jul 5, 2023
a624cef
matching indent
Jul 5, 2023
6b77751
Merge branch '2023.06' into eessi-2023.06-Qt5/5.15.2
boegel Jul 5, 2023
6e524c9
Merge branch 'eessi-2023.06-Qt5/5.15.2' of github.com:TopRichard/bot-…
boegel Jul 5, 2023
ca7e368
retain alphabetical order in parse hooks
boegel Jul 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down Expand Up @@ -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,
}

Expand Down
5 changes: 5 additions & 0 deletions eessi-2023.06-eb-4.7.2-2021a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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