From b2970a574e6d9b2b5767e2415bdd760ad241ba60 Mon Sep 17 00:00:00 2001 From: Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:50:16 -0800 Subject: [PATCH 1/2] py-pyhdf: use zlib-api --- var/spack/repos/builtin/packages/py-pyhdf/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-pyhdf/package.py b/var/spack/repos/builtin/packages/py-pyhdf/package.py index 0cdb79ef0fc3a1..fa1dbb3c2f9f43 100644 --- a/var/spack/repos/builtin/packages/py-pyhdf/package.py +++ b/var/spack/repos/builtin/packages/py-pyhdf/package.py @@ -26,7 +26,7 @@ class PyPyhdf(PythonPackage): depends_on("python@3.2:", 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")) From 4ed211661680a093829f04f93ee2a507139143e5 Mon Sep 17 00:00:00 2001 From: Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:53:55 -0800 Subject: [PATCH 2/2] Update package.py --- var/spack/repos/builtin/packages/py-pyhdf/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pyhdf/package.py b/var/spack/repos/builtin/packages/py-pyhdf/package.py index fa1dbb3c2f9f43..40a3e8c66c25f7 100644 --- a/var/spack/repos/builtin/packages/py-pyhdf/package.py +++ b/var/spack/repos/builtin/packages/py-pyhdf/package.py @@ -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))