From 1d89d4dc130d6d05586dad932e0390236b416de3 Mon Sep 17 00:00:00 2001 From: Brian Vanderwende Date: Fri, 1 Dec 2023 15:42:36 -0700 Subject: MET fixes for 11.1 and HDF4 support (#41372) * MET fixes for 11.1 and HDF4 support * Fix zlib reference in MET --- var/spack/repos/builtin/packages/met/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'var') 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"] -- cgit v1.2.3-60-g2f50