zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MET fixes for 11.1 and HDF4 support (#41372)

Browse Source 
* MET fixes for 11.1 and HDF4 support
* Fix zlib reference in MET
This commit is contained in:
Brian Vanderwende 2023-12-01 15:42:36 -07:00 committed by GitHub
parent bc8a0f56ed
commit 1d89d4dc13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/met/package.py
View File

@ -106,7 +106,7 @@ def setup_build_environment(self, env):
ldflags.append(nc_config("--libs", "--static", output=str).strip()) ldflags.append(nc_config("--libs", "--static", output=str).strip())
libs.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__") cppflags.append("-D__64BIT__")
ldflags.append("-L" + zlib.prefix.lib) ldflags.append("-L" + zlib.prefix.lib)
libs.append("-lz") libs.append("-lz")
@ -128,6 +128,7 @@ def setup_build_environment(self, env):
if "+python" in spec: if "+python" in spec:
python = spec["python"] python = spec["python"]
env.set("MET_PYTHON", python.command.path) 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]) env.set("MET_PYTHON_CC", "-I" + python.headers.directories[0])
py_ld = [python.libs.ld_flags] py_ld = [python.libs.ld_flags]
if spec["python"].satisfies("~shared"): if spec["python"].satisfies("~shared"):
@ -143,6 +144,11 @@ def setup_build_environment(self, env):
env.set("MET_HDF5", hdf.prefix) env.set("MET_HDF5", hdf.prefix)
env.set("MET_HDFEOS", hdfeos.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: if "+graphics" in spec:
cairo = spec["cairo"] cairo = spec["cairo"]
freetype = spec["freetype"] freetype = spec["freetype"]