Skip to content

Fix zlib issue #337

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

Closed
victorapm wants to merge 1 commit into from
Closed

Fix zlib issue #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion scripts/spack_packages/packages/geosx/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,20 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None):

for tpl, cmake_name, enable in io_tpls:
if enable:
cfg.write(cmake_cache_entry('{}_DIR'.format(cmake_name), spec[tpl].prefix))
dep_spec = None
if tpl == 'zlib':
# Spack may concretize zlib-api to zlib-ng instead of zlib.
for candidate in ('zlib', 'zlib-ng', 'zlib-api'):
try:
dep_spec = spec[candidate]
break
except KeyError:
pass
if dep_spec is None:
raise KeyError("No zlib provider (zlib/zlib-ng/zlib-api) found in {0}".format(spec))
else:
dep_spec = spec[tpl]
cfg.write(cmake_cache_entry('{}_DIR'.format(cmake_name), dep_spec.prefix))
else:
cfg.write(cmake_cache_option('ENABLE_{}'.format(cmake_name), False))

Expand Down