diff options
| author | Brian Vanderwende <vanderwb@ucar.edu> | 2023-12-01 15:42:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 14:42:36 -0800 |
| commit | 1d89d4dc130d6d05586dad932e0390236b416de3 (patch) | |
| tree | 156ece63b2e08762c9edb9f8bf7bb4522512aeb1 /var | |
| parent | bc8a0f56ed20b8388633963b0b9a80cfe14c6491 (diff) | |
| download | spack-1d89d4dc130d6d05586dad932e0390236b416de3.tar.gz spack-1d89d4dc130d6d05586dad932e0390236b416de3.tar.bz2 spack-1d89d4dc130d6d05586dad932e0390236b416de3.tar.xz spack-1d89d4dc130d6d05586dad932e0390236b416de3.zip | |
MET fixes for 11.1 and HDF4 support (#41372)
* MET fixes for 11.1 and HDF4 support
* Fix zlib reference in MET
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/met/package.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/met/package.py b/var/spack/repos/builtin/packages/met/package.py index e2571cee9f..0998daeb71 100644 --- a/var/spack/repos/builtin/packages/met/package.py +++ b/var/spack/repos/builtin/packages/met/package.py @@ -106,7 +106,7 @@ class Met(AutotoolsPackage): ldflags.append(nc_config("--libs", "--static", output=str).strip()) libs.append(nc_config("--libs", "--static", output=str).strip()) - zlib = spec["zlib"] + zlib = spec["zlib-api"] cppflags.append("-D__64BIT__") ldflags.append("-L" + zlib.prefix.lib) libs.append("-lz") @@ -128,6 +128,7 @@ class Met(AutotoolsPackage): if "+python" in spec: python = spec["python"] env.set("MET_PYTHON", python.command.path) + env.set("MET_PYTHON_BIN_EXE", python.command.path) env.set("MET_PYTHON_CC", "-I" + python.headers.directories[0]) py_ld = [python.libs.ld_flags] if spec["python"].satisfies("~shared"): @@ -143,6 +144,11 @@ class Met(AutotoolsPackage): env.set("MET_HDF5", hdf.prefix) env.set("MET_HDFEOS", hdfeos.prefix) + if "+szip" in hdf: + libs.append(" ".join(hdf["szip"].libs)) + if "+external-xdr" in hdf: + libs.append(" ".join(hdf["rpc"].libs)) + if "+graphics" in spec: cairo = spec["cairo"] freetype = spec["freetype"] |