Skip to content

Commit

Permalink
Merge pull request #409 from JCSDA/zlibng
Browse files Browse the repository at this point in the history
py-pyhdf: use zlib-api
  • Loading branch information
climbfuji authored Mar 5, 2024
2 parents 8e40b08 + 4ed2116 commit b1f29d9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions var/spack/repos/builtin/packages/py-pyhdf/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class PyPyhdf(PythonPackage):
depends_on("[email protected]:", type=("build", "run"))

# Dependencies
depends_on("zlib", type=("build", "run"))
depends_on("zlib-api", type=("build", "run"))
depends_on("hdf", type=("build", "run"))
depends_on("py-numpy", type=("build", "run"))
depends_on("jpeg", type=("build", "run"))
Expand All @@ -35,10 +35,10 @@ def setup_build_environment(self, env):
inc_dirs = []
lib_dirs = []
# Strip -I and -L from spec include_flags / search_flags
inc_dirs.append(self.spec["zlib"].headers.include_flags.lstrip("-I"))
inc_dirs.append(self.spec["zlib-api"].headers.include_flags.lstrip("-I"))
inc_dirs.append(self.spec["hdf"].headers.include_flags.lstrip("-I"))
inc_dirs.append(self.spec["jpeg"].headers.include_flags.lstrip("-I"))
lib_dirs.append(self.spec["zlib"].libs.search_flags.lstrip("-L"))
lib_dirs.append(self.spec["zlib-api"].libs.search_flags.lstrip("-L"))
lib_dirs.append(self.spec["hdf"].libs.search_flags.lstrip("-L"))
lib_dirs.append(self.spec["jpeg"].libs.search_flags.lstrip("-L"))
env.set("INCLUDE_DIRS", ":".join(inc_dirs))
Expand Down

0 comments on commit b1f29d9

Please sign in to comment.