Skip to content

Commit e2075ff

Browse files
authored
Merge pull request #660 from trz42/2023.06-software.eessi.io-grpcio-1.57.0-2023a
{2023.06}[foss/2023a] grpcio v1.57.0
2 parents 81d27c7 + 59be0bf commit e2075ff

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ easyconfigs:
4040
options:
4141
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21136
4242
from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc
43+
- grpcio-1.57.0-GCCcore-12.3.0.eb

eb_hooks.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,19 @@ def parse_hook_fontconfig_add_fonts(ec, eprefix):
220220
raise EasyBuildError("fontconfig-specific hook triggered for non-fontconfig easyconfig?!")
221221

222222

223+
def parse_hook_grpcio_zlib(ec, ecprefix):
224+
"""Adjust preinstallopts to use ZLIB from compat layer."""
225+
if ec.name == 'grpcio' and ec.version in ['1.57.0']:
226+
exts_list = ec['exts_list']
227+
original_preinstallopts = (exts_list[0][2])['preinstallopts']
228+
original_option = "GRPC_PYTHON_BUILD_SYSTEM_ZLIB=True"
229+
new_option = "GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False"
230+
(exts_list[0][2])['preinstallopts'] = original_preinstallopts.replace(original_option, new_option, 1)
231+
print_msg("Modified the easyconfig to use compat ZLIB with GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False")
232+
else:
233+
raise EasyBuildError("grpcio-specific hook triggered for a non-grpcio easyconfig?!")
234+
235+
223236
def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
224237
"""Relax number of failing numerical LAPACK tests for aarch64/neoverse_v1 CPU target for OpenBLAS < 0.3.23"""
225238
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
@@ -743,6 +756,7 @@ def inject_gpu_property(ec):
743756
'casacore': parse_hook_casacore_disable_vectorize,
744757
'CGAL': parse_hook_cgal_toolchainopts_precise,
745758
'fontconfig': parse_hook_fontconfig_add_fonts,
759+
'grpcio': parse_hook_grpcio_zlib,
746760
'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64,
747761
'CP2K': parse_hook_CP2K_remove_deps_for_aarch64,
748762
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,

0 commit comments

Comments
 (0)