From a221bccc50fafaff23a5e96b5ca612387e00c520 Mon Sep 17 00:00:00 2001 From: Mattias Date: Tue, 10 Jun 2025 11:07:21 +0200 Subject: [PATCH 1/3] {2023.06}[GCC/13.2.0] vsearch 2.30.0 --- .../software.eessi.io/2023.06/eessi-2023.06-eb-5.1.0-2023b.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.0-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.0-2023b.yml index 58b079ab6b..6dfe02bf19 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.0-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.0-2023b.yml @@ -1,2 +1,3 @@ easyconfigs: - buildenv-default-foss-2023b.eb + - VSEARCH-2.30.0-GCC-13.2.0.eb From 48ba8a3fdcad787ab4a609eccb19aba08428f9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 10 Jun 2025 14:33:32 +0200 Subject: [PATCH 2/3] add VSEARCH configure hook --- eb_hooks.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eb_hooks.py b/eb_hooks.py index 359ea6d0d7..7b745d3813 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -600,6 +600,18 @@ def pre_configure_hook_score_p(self, *args, **kwargs): raise EasyBuildError("Score-P-specific hook triggered for non-Score-P easyconfig?!") +def pre_configure_hook_vsearch(self, *args, **kwargs): + """ + Pre-configure hook for VSEARCH + - Workaround for a Zlib macro being renamed in Gentoo, see https://bugs.gentoo.org/383179 + (solves "expected initializer before 'OF'" errors) + """ + if self.name == 'VSEARCH': + self.cfg.update('configopts', 'CPPFLAGS="-DOF=_Z_OF ${CPPFLAGS}"') + else: + raise EasyBuildError("VSEARCH-specific hook triggered for non-Score-P easyconfig?!") + + def pre_configure_hook_extrae(self, *args, **kwargs): """ Pre-configure hook for Extrae @@ -1286,6 +1298,7 @@ def post_module_hook(self, *args, **kwargs): 'WRF': pre_configure_hook_wrf_aarch64, 'LAMMPS': pre_configure_hook_LAMMPS_zen4, 'Score-P': pre_configure_hook_score_p, + 'VSEARCH': pre_configure_hook_vsearch, } PRE_TEST_HOOKS = { From ea248200f04bae83a681cda5927f379fe64f8cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 10 Jun 2025 14:49:52 +0200 Subject: [PATCH 3/3] Update eb_hooks.py Co-authored-by: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com> --- eb_hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eb_hooks.py b/eb_hooks.py index 7b745d3813..acbe6cab22 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -609,7 +609,7 @@ def pre_configure_hook_vsearch(self, *args, **kwargs): if self.name == 'VSEARCH': self.cfg.update('configopts', 'CPPFLAGS="-DOF=_Z_OF ${CPPFLAGS}"') else: - raise EasyBuildError("VSEARCH-specific hook triggered for non-Score-P easyconfig?!") + raise EasyBuildError("VSEARCH-specific hook triggered for non-VSEARCH easyconfig?!") def pre_configure_hook_extrae(self, *args, **kwargs):