Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
easyconfigs:
- Stacks-2.62-foss-2022a.eb
- ImageMagick-7.1.0-37-GCCcore-11.3.0.eb:
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/20086
options:
from-pr: 20086
13 changes: 13 additions & 0 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,18 @@ def parse_hook_fontconfig_add_fonts(ec, eprefix):
raise EasyBuildError("fontconfig-specific hook triggered for non-fontconfig easyconfig?!")


def parse_hook_imagemagick_add_dependency(ec, eprefix):
"""Add dependency for PCRE/8.45 for ImageMagick/7.1.0-37"""
if ec.name == 'ImageMagick':
if LooseVersion(ec.version) == LooseVersion('7.1.0-37'):
print_msg("Added dependency for PCRE/8.45 to %s/%s", ec.name, ec.version)
ec['dependencies'].append(('PCRE', '8.45'))
else:
print_msg("Not adding dependency for PCRE/8.45 to %s/%s", ec.name, ec.version)
else:
raise EasyBuildError("ImageMagick-specific hook triggered for non-ImageMagick easyconfig?!")


def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
"""Relax number of failing numerical LAPACK tests for aarch64/* CPU targets for OpenBLAS < 0.3.23"""
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
Expand Down Expand Up @@ -589,6 +601,7 @@ def inject_gpu_property(ec):
PARSE_HOOKS = {
'CGAL': parse_hook_cgal_toolchainopts_precise,
'fontconfig': parse_hook_fontconfig_add_fonts,
'ImageMagick': parse_hook_imagemagick_add_dependency,
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
'Pillow-SIMD' : parse_hook_Pillow_SIMD_harcoded_paths,
'pybind11': parse_hook_pybind11_replace_catch2,
Expand Down