Skip to content

apply workaround for renamed Gentoo's zlib macro to VSEARCH, FreeXL, libspatialite #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 29, 2025
Merged

apply workaround for renamed Gentoo's zlib macro to VSEARCH, FreeXL, libspatialite #94

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1cf9de
changes required for PR 1208 in software-layer
Sep 29, 2025
e7e369b
updated the hook to target several packages
Sep 29, 2025
3ce5cf4
test new hook
bedroge Sep 29, 2025
4c13e92
force rebuild
bedroge Sep 29, 2025
b922e34
remove test easystack
bedroge Sep 29, 2025
9c5a503
insert blank line
bedroge Sep 29, 2025
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
18 changes: 5 additions & 13 deletions eb_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,11 @@ def pre_configure_hook(self, *args, **kwargs):
if self.name in PRE_CONFIGURE_HOOKS:
PRE_CONFIGURE_HOOKS[self.name](self, *args, **kwargs)

# workaround for a Zlib macro being renamed in Gentoo, see https://bugs.gentoo.org/383179
# (solves "expected initializer before 'OF'" errors)
if self.name in ['FreeXL', 'libspatialite', 'VSEARCH']:
self.cfg.update('configopts', 'CPPFLAGS="-DOF=_Z_OF ${CPPFLAGS}"')


def pre_configure_hook_BLIS_a64fx(self, *args, **kwargs):
"""
Expand Down Expand Up @@ -802,18 +807,6 @@ 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-VSEARCH easyconfig?!")


def pre_configure_hook_extrae(self, *args, **kwargs):
"""
Pre-configure hook for Extrae
Expand Down Expand Up @@ -1623,7 +1616,6 @@ def post_easyblock_hook(self, *args, **kwargs):
'WRF': pre_configure_hook_wrf_aarch64,
'LAMMPS': pre_configure_hook_LAMMPS_zen4_and_aarch64_cuda,
'Score-P': pre_configure_hook_score_p,
'VSEARCH': pre_configure_hook_vsearch,
'CMake': pre_configure_hook_cmake_system,
}

Expand Down