From d13996c00c9b690e9167a301aa02a34ad34eafcb Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 12 Mar 2024 20:38:09 +0100 Subject: [PATCH 1/3] {2023.06}[foss/2022b] ImageMagick v7.1.0-53 --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2022b.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2022b.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2022b.yml index 95b572d1b4..d9d36b445b 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2022b.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.0-2022b.yml @@ -1,3 +1,7 @@ easyconfigs: - GLib-2.75.0-GCCcore-12.2.0.eb - Qt5-5.15.7-GCCcore-12.2.0.eb + - ImageMagick-7.1.0-53-GCCcore-12.2.0.eb: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20086 + options: + from-pr: 20086 From c06e7790bda7870c9355ef23aeda42385d847b4e Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 13 Mar 2024 09:22:13 +0100 Subject: [PATCH 2/3] add ImageMagick parse hook --- eb_hooks.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index 585b70a899..62ed947a02 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -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 PRCE/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') @@ -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, From 6c351189ff9eb8982a6e571d7eb2dc5567f2d32f Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 13 Mar 2024 13:22:57 +0100 Subject: [PATCH 3/3] fix package name typo --- eb_hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eb_hooks.py b/eb_hooks.py index 62ed947a02..e0f29ea031 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -191,7 +191,7 @@ def parse_hook_imagemagick_add_dependency(ec, eprefix): 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 PRCE/8.45 to %s/%s", ec.name, ec.version) + 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?!")