diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2023-08-09 15:22:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 09:22:58 -0400 |
| commit | e51748ee8f89e0d3db4e426e3d04157129a45622 (patch) | |
| tree | 52b1ae53faadc872e8f51ab5950e19404cc158c3 | |
| parent | f9457fa80ba51d14610df8b57a6b5a514d6bb6ff (diff) | |
| download | spack-e51748ee8f89e0d3db4e426e3d04157129a45622.tar.gz spack-e51748ee8f89e0d3db4e426e3d04157129a45622.tar.bz2 spack-e51748ee8f89e0d3db4e426e3d04157129a45622.tar.xz spack-e51748ee8f89e0d3db4e426e3d04157129a45622.zip | |
zlib-api: new virtual with zlib/zlib-ng as providers (#37372)
Introduces a new virtual zlib-api, which replaces zlib in most packages.
This allows users to switch to zlib-ng by default for better performance.
442 files changed, 840 insertions, 549 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 364b0d218e..aaddf5ac6b 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -60,6 +60,7 @@ packages: xxd: [xxd-standalone, vim] yacc: [bison, byacc] ziglang: [zig] + zlib-api: [zlib, zlib-ng+compat] permissions: read: world write: user diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index fe1935cfb5..4121218955 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2243,7 +2243,7 @@ looks like this: url = "http://www.openssl.org/source/openssl-1.0.1h.tar.gz" version("1.0.1h", md5="8d6d684a9430d5cc98a62a5d8fbda8cf") - depends_on("zlib") + depends_on("zlib-api") parallel = False diff --git a/lib/spack/spack/test/data/unparse/llvm.txt b/lib/spack/spack/test/data/unparse/llvm.txt index f16fd9cc47..834ab2dc92 100644 --- a/lib/spack/spack/test/data/unparse/llvm.txt +++ b/lib/spack/spack/test/data/unparse/llvm.txt @@ -235,7 +235,7 @@ class Llvm(CMakePackage, CudaPackage): depends_on("libffi", when="+cuda") # libomptarget # llvm-config --system-libs libraries. - depends_on("zlib") + depends_on("zlib-api") # lldb dependencies depends_on("swig", when="+lldb") diff --git a/var/spack/repos/builtin/packages/3dtk/package.py b/var/spack/repos/builtin/packages/3dtk/package.py index c01faaaba6..a3bac5bb67 100644 --- a/var/spack/repos/builtin/packages/3dtk/package.py +++ b/var/spack/repos/builtin/packages/3dtk/package.py @@ -50,7 +50,7 @@ class _3dtk(CMakePackage): "boost@:1.75+serialization+graph+regex+filesystem+system+thread+date_time+program_options" ) depends_on("suite-sparse") - depends_on("zlib") + depends_on("zlib-api") depends_on("libpng") depends_on("eigen") depends_on("cgal", when="+cgal") diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 06e3923477..043bf586b2 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -65,7 +65,7 @@ class Adios(AutotoolsPackage): depends_on("mpi", when="+mpi") # optional transformations - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("bzip2", when="+bzip2") depends_on("szip", when="+szip") depends_on("sz@:1.4.10", when="@:1.12.0 +sz") @@ -147,8 +147,13 @@ class Adios(AutotoolsPackage): extra_args += self.with_or_without("mpi", activation_value="prefix") extra_args += self.with_or_without("infiniband") + if "+zlib" in spec: + extra_args.append("--with-zlib={0}".format(spec["zlib-api"].prefix)) + else: + extra_args.append("--without-zlib") + # Transforms - variants = ["zlib", "bzip2", "szip"] + variants = ["bzip2", "szip"] if spec.satisfies("@1.11.0:"): variants += ["zfp"] if spec.satisfies("@1.12.0:"): diff --git a/var/spack/repos/builtin/packages/advancecomp/package.py b/var/spack/repos/builtin/packages/advancecomp/package.py index b3d050247b..176ce547c1 100644 --- a/var/spack/repos/builtin/packages/advancecomp/package.py +++ b/var/spack/repos/builtin/packages/advancecomp/package.py @@ -23,4 +23,4 @@ class Advancecomp(AutotoolsPackage): depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/alembic/package.py b/var/spack/repos/builtin/packages/alembic/package.py index 9a873e097b..31a653c0c8 100644 --- a/var/spack/repos/builtin/packages/alembic/package.py +++ b/var/spack/repos/builtin/packages/alembic/package.py @@ -25,7 +25,7 @@ class Alembic(CMakePackage): depends_on("openexr@2.2.0:") depends_on("hdf5@1.8.9:", when="+hdf5") depends_on("boost@1.55:") - depends_on("zlib") + depends_on("zlib-api") depends_on("py-ilmbase", when="+python") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/amber/package.py b/var/spack/repos/builtin/packages/amber/package.py index cb0e552cf3..e647a74cd4 100644 --- a/var/spack/repos/builtin/packages/amber/package.py +++ b/var/spack/repos/builtin/packages/amber/package.py @@ -125,7 +125,7 @@ class Amber(Package, CudaPackage): variant("x11", description="Build programs that require X11", default=False) variant("update", description="Update the sources prior compilation", default=False) - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") depends_on("flex", type="build") depends_on("bison", type="build") diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py index 0a03f76a4d..1716a13e57 100644 --- a/var/spack/repos/builtin/packages/amp/package.py +++ b/var/spack/repos/builtin/packages/amp/package.py @@ -48,7 +48,7 @@ class Amp(CMakePackage): depends_on("silo", when="+silo") depends_on("sundials", when="+sundials") depends_on("trilinos", when="+trilinos") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") # MPI related dependencies depends_on("mpi", when="+mpi") @@ -101,6 +101,10 @@ class Amp(CMakePackage): ] ) + if "+zlib" in spec: + tpl_list.append("ZLIB") + options.append(self.define("TPL_ZLIB_INSTALL_DIR", spec["zlib-api"].prefix)) + for vname in ( "boost", "hdf5", @@ -110,7 +114,6 @@ class Amp(CMakePackage): "silo", "sundials", "trilinos", - "zlib", ): if "+" + vname in spec: tpl_list.append(vname.upper()) diff --git a/var/spack/repos/builtin/packages/angsd/package.py b/var/spack/repos/builtin/packages/angsd/package.py index ce505bb83c..4e8caed26b 100644 --- a/var/spack/repos/builtin/packages/angsd/package.py +++ b/var/spack/repos/builtin/packages/angsd/package.py @@ -27,7 +27,7 @@ class Angsd(MakefilePackage): depends_on("htslib") conflicts("^htslib@1.6:", when="@0.919") - depends_on("zlib") + depends_on("zlib-api") depends_on("lzma") depends_on("curl") diff --git a/var/spack/repos/builtin/packages/ants/package.py b/var/spack/repos/builtin/packages/ants/package.py index 71e8c5f36a..8e5001ddde 100644 --- a/var/spack/repos/builtin/packages/ants/package.py +++ b/var/spack/repos/builtin/packages/ants/package.py @@ -25,7 +25,7 @@ class Ants(CMakePackage): version("2.3.5", sha256="2fddfd5f274a47f1c383e734a7e763b627c4a8383d2d3b9971561f335016bb0a") version("2.2.0", sha256="62f8f9ae141cb45025f4bb59277c053acf658d4a3ba868c9e0f609af72e66b4a") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") variant("minc", default=True, description="Build ITK with MINC support") diff --git a/var/spack/repos/builtin/packages/aocc/package.py b/var/spack/repos/builtin/packages/aocc/package.py index 87c1b8a991..229a37bb53 100644 --- a/var/spack/repos/builtin/packages/aocc/package.py +++ b/var/spack/repos/builtin/packages/aocc/package.py @@ -53,7 +53,7 @@ class Aocc(Package): license_url = "https://www.amd.com/en/developer/aocc/aocc-compiler/eula.html" depends_on("libxml2") - depends_on("zlib") + depends_on("zlib-api") depends_on("ncurses") depends_on("libtool") depends_on("texinfo") diff --git a/var/spack/repos/builtin/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py index f1590023bf..76b213a40f 100644 --- a/var/spack/repos/builtin/packages/apex/package.py +++ b/var/spack/repos/builtin/packages/apex/package.py @@ -92,7 +92,7 @@ class Apex(CMakePackage): variant("examples", default=False, description="Build Examples") # Dependencies - depends_on("zlib") + depends_on("zlib-api") depends_on("cmake@3.10.0:", type="build") depends_on("binutils@2.33:+libiberty+headers", when="+binutils") depends_on("gettext", when="+binutils ^binutils+nls") diff --git a/var/spack/repos/builtin/packages/aria2/package.py b/var/spack/repos/builtin/packages/aria2/package.py index af6de10a6f..176fe90487 100644 --- a/var/spack/repos/builtin/packages/aria2/package.py +++ b/var/spack/repos/builtin/packages/aria2/package.py @@ -20,6 +20,6 @@ class Aria2(AutotoolsPackage): depends_on("libxml2") depends_on("libssh2") depends_on("libgcrypt") - depends_on("zlib") + depends_on("zlib-api") depends_on("c-ares") depends_on("sqlite") diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index 4f3db1ad8b..872a2baa2d 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -56,8 +56,9 @@ class Arrow(CMakePackage, CudaPackage): depends_on("utf8proc@2.7.0: +shared", when="+gandiva") depends_on("utf8proc@2.7.0: +shared", when="+python") depends_on("xsimd@8.1.0:", when="@9.0.0:") - depends_on("zlib+pic", when="+zlib @9:") - depends_on("zlib+pic", when="@:8") + depends_on("zlib-api", when="+zlib @9:") + depends_on("zlib-api", when="@:8") + conflicts("^zlib~pic") depends_on("zstd", when="+zstd @9:") depends_on("zstd", when="@:8") @@ -148,13 +149,17 @@ class Arrow(CMakePackage, CudaPackage): args.append(self.define_from_variant("ARROW_WITH_ZSTD", "zstd")) with when("@:8"): - dep_list = ["flatbuffers", "rapidjson", "zlib", "zstd"] + args.extend( + [ + self.define("FLATBUFFERS_HOME", self.spec["flatbuffers"].prefix), + self.define("RAPIDJSON_HOME", self.spec["rapidjson"].prefix), + self.define("ZSTD_HOME", self.spec["zstd"].prefix), + self.define("ZLIB_HOME", self.spec["zlib-api"].prefix), + self.define("ZLIB_LIBRARIES", self.spec["zlib-api"].libs), + ] + ) if self.spec.satisfies("+snappy"): - dep_list.append("snappy") - - for dep in dep_list: - args.append("-D{0}_HOME={1}".format(dep.upper(), self.spec[dep].prefix)) - args.append("-DZLIB_LIBRARIES={0}".format(self.spec["zlib"].libs)) + args.append(self.define("SNAPPY_HOME", self.spec["snappy"].prefix)) return args diff --git a/var/spack/repos/builtin/packages/asdf-cxx/package.py b/var/spack/repos/builtin/packages/asdf-cxx/package.py index 840d895799..01e83e1923 100644 --- a/var/spack/repos/builtin/packages/asdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/asdf-cxx/package.py @@ -47,4 +47,4 @@ class AsdfCxx(CMakePackage): depends_on("swig @3.0.0:3", type="build") # Neither earlier nor later versions of yaml-cpp work depends_on("yaml-cpp @0.6.3") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 58a4377ce8..70aa765489 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -36,7 +36,7 @@ class Assimp(CMakePackage): variant("shared", default=True, description="Enables the build of shared libraries") depends_on("pkgconfig", type="build") - depends_on("zlib") + depends_on("zlib-api") def patch(self): filter_file("-Werror", "", "code/CMakeLists.txt") diff --git a/var/spack/repos/builtin/packages/atop/package.py b/var/spack/repos/builtin/packages/atop/package.py index f2dd7d3929..670b7e37c7 100644 --- a/var/spack/repos/builtin/packages/atop/package.py +++ b/var/spack/repos/builtin/packages/atop/package.py @@ -18,7 +18,7 @@ class Atop(Package): version("2.2.6", sha256="d0386840ee4df36e5d0ad55f144661b434d9ad35d94deadc0405b514485db615") version("2.2-3", sha256="c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d") - depends_on("zlib") + depends_on("zlib-api") depends_on("ncurses") def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index 5aad912934..e0e002d6fc 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -45,7 +45,7 @@ class Augustus(MakefilePackage): # for instance depends_on('boost +filesystem') # See https://github.com/spack/spack/pull/22303 for reference depends_on(Boost.with_default_variants) - depends_on("zlib") + depends_on("zlib-api") depends_on("htslib") depends_on("bcftools") depends_on("samtools") diff --git a/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py b/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py index 84a4224dbd..3377edd9b2 100644 --- a/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py +++ b/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py @@ -22,7 +22,7 @@ class AwsSdkCpp(CMakePackage): version("1.9.247", tag="1.9.247", submodules=True) depends_on("cmake@3.1:", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("curl") # https://github.com/aws/aws-sdk-cpp/issues/1816 diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index 0576583a3a..169f7afaac 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -44,7 +44,7 @@ class Axl(CMakePackage): ) depends_on("kvtree") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("kvtree@main", when="@main") depends_on("kvtree@:1.2.0", when="@:0.5.0") diff --git a/var/spack/repos/builtin/packages/bamdst/package.py b/var/spack/repos/builtin/packages/bamdst/package.py index 398c579fdf..fdd01f2b65 100644 --- a/var/spack/repos/builtin/packages/bamdst/package.py +++ b/var/spack/repos/builtin/packages/bamdst/package.py @@ -14,7 +14,7 @@ class Bamdst(MakefilePackage): version("master", git="https://github.com/shiquan/bamdst.git") - depends_on("zlib") + depends_on("zlib-api") parallel = False diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index 42bf32444f..c45a07e61e 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -22,7 +22,7 @@ class Bamtools(CMakePackage): version("2.3.0", sha256="288046e6d5d41afdc5fce8608c5641cf2b8e670644587c1315b90bbe92f039af") version("2.2.3", sha256="92ddef44801a1f8f01ce1a397f83e0f8b5e1ae8ad92c620f2dafaaf8d54cf178") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("jsoncpp") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/bamutil/package.py b/var/spack/repos/builtin/packages/bamutil/package.py index ddc2ce9f14..ffa9c2a269 100644 --- a/var/spack/repos/builtin/packages/bamutil/package.py +++ b/var/spack/repos/builtin/packages/bamutil/package.py @@ -24,7 +24,7 @@ class Bamutil(MakefilePackage): url="https://genome.sph.umich.edu/w/images/7/70/BamUtilLibStatGen.1.0.13.tgz", ) - depends_on("zlib") + depends_on("zlib-api") depends_on("git", type="build", when="@1.0.15:") patch("libstatgen-issue-9.patch", when="@1.0.13") diff --git a/var/spack/repos/builtin/packages/bbcp/package.py b/var/spack/repos/builtin/packages/bbcp/package.py index 27ad399e46..fc329aa066 100644 --- a/var/spack/repos/builtin/packages/bbcp/package.py +++ b/var/spack/repos/builtin/packages/bbcp/package.py @@ -17,7 +17,7 @@ class Bbcp(Package): # Stanford's git server does not support "smart https" shallow clones version("master", branch="master", get_full_repo=True) - depends_on("zlib") + depends_on("zlib-api") depends_on("openssl") depends_on("libnsl") diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index 9b49f6073c..2dfc2ac8e5 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -41,7 +41,7 @@ class Bcl2fastq2(Package): depends_on("libxml2@2.7.8") depends_on("libxslt@1.1.26~crypto") depends_on("libgcrypt") - depends_on("zlib") + depends_on("zlib-api") # Their cmake macros don't set the flag when they find a library # that makes them happy. diff --git a/var/spack/repos/builtin/packages/bedtools2/package.py b/var/spack/repos/builtin/packages/bedtools2/package.py index 5313c7bbdb..9a3fb8bec4 100644 --- a/var/spack/repos/builtin/packages/bedtools2/package.py +++ b/var/spack/repos/builtin/packages/bedtools2/package.py @@ -24,7 +24,7 @@ class Bedtools2(Package): version("2.25.0", sha256="159122afb9978015f7ec85d7b17739b01415a5738086b20a48147eeefcf08cfb") version("2.23.0", sha256="9dacaa561d11ce9835d1d51e5aeb092bcbe117b7119663ec9a671abac6a36056") - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2", when="@2.29:") depends_on("xz", when="@2.29:") depends_on("python", type="build") diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index e182d2236e..f0a7d5f4bf 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -130,7 +130,7 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage): # pkg-config is used to find zstd in gas/configure depends_on("pkgconfig", type="build") depends_on("zstd@1.4.0:", when="@2.40:") - depends_on("zlib") + depends_on("zlib-api") depends_on("diffutils", type="build") depends_on("gettext", when="+nls") diff --git a/var/spack/repos/builtin/packages/bioawk/package.py b/var/spack/repos/builtin/packages/bioawk/package.py index 21b1d08e19..57d0c629eb 100644 --- a/var/spack/repos/builtin/packages/bioawk/package.py +++ b/var/spack/repos/builtin/packages/bioawk/package.py @@ -17,7 +17,7 @@ class Bioawk(MakefilePackage): version("1.0", sha256="316a6561dda41e8327b85106db3704e94e23d7a89870392d19ef8559f7859e2d") - depends_on("zlib") + depends_on("zlib-api") depends_on("bison", type=("build")) parallel = False diff --git a/var/spack/repos/builtin/packages/biobloom/package.py b/var/spack/repos/builtin/packages/biobloom/package.py index a24f8cec95..aacf157428 100644 --- a/var/spack/repos/builtin/packages/biobloom/package.py +++ b/var/spack/repos/builtin/packages/biobloom/package.py @@ -19,7 +19,7 @@ class Biobloom(AutotoolsPackage): depends_on("boost+exception+math+serialization+container") depends_on("sdsl-lite") depends_on("sparsehash") - depends_on("zlib") + depends_on("zlib-api") def configure_args(self): # newer versions of sdsl-lite introduce tolerable warnings diff --git a/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py b/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py index 45428fbe73..657473676a 100644 --- a/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py +++ b/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py @@ -15,6 +15,6 @@ class BioconductorRsubread(RPackage): bioc = "rsubread" depends_on("r-matrix") - depends_on("zlib") + depends_on("zlib-api") version("2.14.2", sha256="ac8be0fad0eb2743443e3a60a9a94eec78c746638aaccca70e7166d034dcebb5") diff --git a/var/spack/repos/builtin/packages/bitgroomingz/package.py b/var/spack/repos/builtin/packages/bitgroomingz/package.py index 0343a2674a..f501e70bac 100644 --- a/var/spack/repos/builtin/packages/bitgroomingz/package.py +++ b/var/spack/repos/builtin/packages/bitgroomingz/package.py @@ -19,7 +19,7 @@ class Bitgroomingz(CMakePackage): variant("shared", default=True, description="build shared libs") - depends_on("zlib") + depends_on("zlib-api") def cmake_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/blast-plus/package.py b/var/spack/repos/builtin/packages/blast-plus/package.py index 1e934b93fb..5dc62ed13c 100644 --- a/var/spack/repos/builtin/packages/blast-plus/package.py +++ b/var/spack/repos/builtin/packages/blast-plus/package.py @@ -69,7 +69,7 @@ class BlastPlus(AutotoolsPackage): # depends_on('hdf5', when='+hdf5') depends_on("gnutls", when="+gnutls") depends_on("openssl", when="+openssl") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("bzip2", when="+bzip2") depends_on("lzo", when="+lzo") depends_on("pcre", when="+pcre") @@ -121,7 +121,7 @@ class BlastPlus(AutotoolsPackage): # config_args.append('--without-hdf5') if "+zlib" in spec: - config_args.append("--with-z={0}".format(self.spec["zlib"].prefix)) + config_args.append("--with-z={0}".format(self.spec["zlib-api"].prefix)) else: config_args.append("--without-z") diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 1ea1e30321..6cb3fbfc67 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -95,7 +95,7 @@ class Bohrium(CMakePackage, CudaPackage): depends_on("py-pip", type="build", when="+python") depends_on("py-wheel", type="build", when="+python") - depends_on("zlib", when="+proxy") + depends_on("zlib-api", when="+proxy") depends_on("libsigsegv") diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 60fe4a9f46..cd7550a381 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -229,7 +229,7 @@ class Boost(Package): depends_on("mpi", when="+mpi") depends_on("bzip2", when="+iostreams") - depends_on("zlib", when="+iostreams") + depends_on("zlib-api", when="+iostreams") depends_on("zstd", when="+iostreams") depends_on("xz", when="+iostreams") depends_on("py-numpy", when="+numpy", type=("build", "run")) @@ -526,9 +526,9 @@ class Boost(Package): "-s", "BZIP2_LIBPATH=%s" % spec["bzip2"].prefix.lib, "-s", - "ZLIB_INCLUDE=%s" % spec["zlib"].prefix.include, + "ZLIB_INCLUDE=%s" % spec["zlib-api"].prefix.include, "-s", - "ZLIB_LIBPATH=%s" % spec["zlib"].prefix.lib, + "ZLIB_LIBPATH=%s" % spec["zlib-api"].prefix.lib, "-s", "LZMA_INCLUDE=%s" % spec["xz"].prefix.include, "-s", diff --git a/var/spack/repos/builtin/packages/bowtie/package.py b/var/spack/repos/builtin/packages/bowtie/package.py index 6bb9444460..55e6f53cb5 100644 --- a/var/spack/repos/builtin/packages/bowtie/package.py +++ b/var/spack/repos/builtin/packages/bowtie/package.py @@ -48,7 +48,7 @@ class Bowtie(MakefilePackage): variant("tbb", default=False, description="Use Intel thread building block") depends_on("tbb", when="+tbb") - depends_on("zlib") + depends_on("zlib-api") # See: https://github.com/BenLangmead/bowtie/issues/87, a # different fix is in the FreeBSD ports/package tree diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py index a7fa9d84e0..4a26602a74 100644 --- a/var/spack/repos/builtin/packages/bowtie2/package.py +++ b/var/spack/repos/builtin/packages/bowtie2/package.py @@ -29,7 +29,7 @@ class Bowtie2(MakefilePackage): depends_on("readline", when="@2.3.1:") depends_on("perl", type="run") depends_on("python", type="run") - depends_on("zlib", when="@2.3.1:") + depends_on("zlib-api", when="@2.3.1:") depends_on("simde", when="@2.4.0: target=aarch64:", type="link") depends_on("simde", when="@2.4.0: target=ppc64le:", type="link") diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py index 82ed40a244..743e7ed81c 100644 --- a/var/spack/repos/builtin/packages/breakdancer/package.py +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -28,7 +28,7 @@ class Breakdancer(CMakePackage): preferred=True, ) - depends_on("zlib") + depends_on("zlib-api") depends_on("ncurses", type="link") diff --git a/var/spack/repos/builtin/packages/breseq/package.py b/var/spack/repos/builtin/packages/breseq/package.py index 16da2454f7..865c1f333d 100644 --- a/var/spack/repos/builtin/packages/breseq/package.py +++ b/var/spack/repos/builtin/packages/breseq/package.py @@ -23,7 +23,7 @@ class Breseq(AutotoolsPackage): depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("bedtools2", type="run") depends_on("r", type="run") @@ -32,5 +32,5 @@ class Breseq(AutotoolsPackage): conflicts("%clang@:3.3") def setup_build_environment(self, env): - env.set("LDFLAGS", "-L{0}".format(self.spec["zlib"].prefix.lib)) - env.set("CFLAGS", "-I{0}".format(self.spec["zlib"].prefix.include)) + env.set("LDFLAGS", "-L{0}".format(self.spec["zlib-api"].prefix.lib)) + env.set("CFLAGS", "-I{0}".format(self.spec["zlib-api"].prefix.include)) diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index 53019f4a73..49e7f40269 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -23,7 +23,7 @@ class Bwa(Package): url="https://github.com/lh3/bwa/archive/0.7.12.tar.gz", ) - depends_on("zlib") + depends_on("zlib-api") depends_on("sse2neon", when="target=aarch64:") patch( @@ -33,7 +33,7 @@ class Bwa(Package): ) def install(self, spec, prefix): - zlib_inc_path = spec["zlib"].prefix.include + zlib_inc_path = spec["zlib-api"].prefix.include if platform.machine() == "aarch64": sse2neon_inc_path = spec["sse2neon"].prefix.include filter_file( @@ -43,7 +43,7 @@ class Bwa(Package): ) else: filter_file(r"^INCLUDES=", "INCLUDES=-I%s" % zlib_inc_path, "Makefile") - filter_file(r"^LIBS=", "LIBS=-L%s " % spec["zlib"].prefix.lib, "Makefile") + filter_file(r"^LIBS=", "LIBS=-L%s " % spec["zlib-api"].prefix.lib, "Makefile") # use spack C compiler filter_file("^CC=.*", "CC={0}".format(spack_cc), "Makefile") # fix gcc 10+ errors diff --git a/var/spack/repos/builtin/packages/c-blosc/package.py b/var/spack/repos/builtin/packages/c-blosc/package.py index dbb9796508..e578004f24 100644 --- a/var/spack/repos/builtin/packages/c-blosc/package.py +++ b/var/spack/repos/builtin/packages/c-blosc/package.py @@ -34,7 +34,7 @@ class CBlosc(CMakePackage): depends_on("cmake@2.8.10:", type="build") depends_on("snappy") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd") depends_on("lz4") diff --git a/var/spack/repos/builtin/packages/c-blosc2/package.py b/var/spack/repos/builtin/packages/c-blosc2/package.py index a0840f5b66..8f9dbbabfd 100644 --- a/var/spack/repos/builtin/packages/c-blosc2/package.py +++ b/var/spack/repos/builtin/packages/c-blosc2/package.py @@ -40,7 +40,7 @@ class CBlosc2(CMakePackage): depends_on("lizard", when="+lizard") depends_on("lz4", when="+lz4") depends_on("snappy", when="+snappy") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("zstd", when="+zstd") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/capnproto/package.py b/var/spack/repos/builtin/packages/capnproto/package.py index e8d95b7eed..cec409eed9 100644 --- a/var/spack/repos/builtin/packages/capnproto/package.py +++ b/var/spack/repos/builtin/packages/capnproto/package.py @@ -34,7 +34,7 @@ class Capnproto(AutotoolsPackage): version("0.5.1.1", sha256="caf308e92683b278bc6c568d4fb5558eca78180cac1eb4a3db15d435bf25116f") version("0.4.1.2", sha256="6376c1910e9bc9d09dc46d53b063c5bdcb5cdf066a8210e9fffe299fb863f0d9") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("openssl", when="+tls") depends_on("autoconf", type="build", when="build_system=autotools") diff --git a/var/spack/repos/builtin/packages/ccache/package.py b/var/spack/repos/builtin/packages/ccache/package.py index a18409632b..06b1eb0968 100644 --- a/var/spack/repos/builtin/packages/ccache/package.py +++ b/var/spack/repos/builtin/packages/ccache/package.py @@ -60,7 +60,7 @@ class Ccache(CMakePackage): depends_on("gperf", when="@:3") depends_on("libxslt", when="@:3") - depends_on("zlib", when="@:3") + depends_on("zlib-api", when="@:3") depends_on("zstd", when="@4.0:") diff --git a/var/spack/repos/builtin/packages/cctools/package.py b/var/spack/repos/builtin/packages/cctools/package.py index 14d107051a..a8e990b783 100644 --- a/var/spack/repos/builtin/packages/cctools/package.py +++ b/var/spack/repos/builtin/packages/cctools/package.py @@ -39,7 +39,7 @@ class Cctools(AutotoolsPackage): depends_on("gettext") # Corrects python linking of -lintl flag. depends_on("swig") # depends_on('xrootd') - depends_on("zlib") + depends_on("zlib-api") patch("arm.patch", when="target=aarch64:") patch("cctools_7.0.18.python.patch", when="@7.0.18") patch("cctools_6.1.1.python.patch", when="@6.1.1") @@ -90,7 +90,9 @@ class Cctools(AutotoolsPackage): args.append("--with-{0}-path=no".format(p)) # point these bits at the Spack installations - for p in ["openssl", "perl", "readline", "swig", "zlib"]: + for p in ["openssl", "perl", "readline", "swig"]: args.append("--with-{0}-path={1}".format(p, self.spec[p].prefix)) + args.append("--with-zlib-path={0}".format(self.spec["zlib-api"].prefix)) + return args diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py index 3349b481c0..adac5de886 100644 --- a/var/spack/repos/builtin/packages/cdbfasta/package.py +++ b/var/spack/repos/builtin/packages/cdbfasta/package.py @@ -14,7 +14,7 @@ class Cdbfasta(MakefilePackage): version("2017-03-16", commit="b3e481fe02dfbc767a3842bcb1b687c60376a5e8") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/cdhit/package.py b/var/spack/repos/builtin/packages/cdhit/package.py index ce45ba1b0b..fb9db33107 100644 --- a/var/spack/repos/builtin/packages/cdhit/package.py +++ b/var/spack/repos/builtin/packages/cdhit/package.py @@ -25,7 +25,7 @@ class Cdhit(MakefilePackage): depends_on("perl", type=("build", "run")) depends_on("perl-text-nsp", type="run") - depends_on("zlib", when="+zlib", type="link") + depends_on("zlib-api", when="+zlib", type="link") def patch(self): for f in glob("*.pl"): diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py index fa66fc4d37..ecdd759d17 100644 --- a/var/spack/repos/builtin/packages/cgal/package.py +++ b/var/spack/repos/builtin/packages/cgal/package.py @@ -60,7 +60,7 @@ class Cgal(CMakePackage): # Required for CGAL_ImageIO # depends_on('opengl', when='+imageio') # not yet in Spack - depends_on("zlib") + depends_on("zlib-api") # Optional to build CGAL_Qt5 (demos) # depends_on('opengl', when='+demos') # not yet in Spack diff --git a/var/spack/repos/builtin/packages/citcoms/package.py b/var/spack/repos/builtin/packages/citcoms/package.py index 9b334fc6b1..6ebe2584f2 100644 --- a/var/spack/repos/builtin/packages/citcoms/package.py +++ b/var/spack/repos/builtin/packages/citcoms/package.py @@ -26,7 +26,7 @@ class Citcoms(AutotoolsPackage): # Required dependencies depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") depends_on("automake", when="@master", type="build") depends_on("autoconf", when="@master", type="build") depends_on("libtool", when="@master", type="build") diff --git a/var/spack/repos/builtin/packages/clamav/package.py b/var/spack/repos/builtin/packages/clamav/package.py index 232e317df4..a93511f0a6 100644 --- a/var/spack/repos/builtin/packages/clamav/package.py +++ b/var/spack/repos/builtin/packages/clamav/package.py @@ -20,7 +20,7 @@ class Clamav(AutotoolsPackage): depends_on("openssl") depends_on("pcre") depends_on("yara") - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") depends_on("curl", type="link") @@ -31,7 +31,7 @@ class Clamav(AutotoolsPackage): "--with-libjson=%s" % spec["json-c"].prefix, "--with-openssl=%s" % spec["openssl"].prefix, "--with-pcre=%s" % spec["pcre"].prefix, - "--with-zlib=%s" % spec["zlib"].prefix, + "--with-zlib=%s" % spec["zlib-api"].prefix, "--with-bzip2=%s" % spec["bzip2"].prefix, ] return args diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index f8134cbf41..415b9b80cc 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -221,7 +221,7 @@ class Cmake(Package): # When using curl, cmake defaults to using system zlib too, probably because # curl already depends on zlib. Therefore, also unconditionaly depend on zlib. - depends_on("zlib") + depends_on("zlib-api") with when("~ownlibs"): depends_on("expat") diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py index 7727709a3a..fd01cdd3d9 100644 --- a/var/spack/repos/builtin/packages/cnpy/package.py +++ b/var/spack/repos/builtin/packages/cnpy/package.py @@ -16,7 +16,7 @@ class Cnpy(CMakePackage): version("master", branch="master") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") def cmake_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/cnvnator/package.py b/var/spack/repos/builtin/packages/cnvnator/package.py index 69b284bf29..01489a2d75 100644 --- a/var/spack/repos/builtin/packages/cnvnator/package.py +++ b/var/spack/repos/builtin/packages/cnvnator/package.py @@ -21,7 +21,7 @@ class Cnvnator(MakefilePackage): depends_on("bzip2") depends_on("curl") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("libdeflate") depends_on("openssl") @@ -42,7 +42,7 @@ class Cnvnator(MakefilePackage): # Link more libs ldflags = [ - spec["zlib"].libs.ld_flags, + spec["zlib-api"].libs.ld_flags, spec["bzip2"].libs.ld_flags, spec["curl"].libs.ld_flags, spec["xz"].libs.ld_flags, diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index f6f6602c59..93a5fcf740 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -110,7 +110,7 @@ class Comgr(CMakePackage): depends_on("cmake@3.2.0:", type="build", when="@:3.8") depends_on("cmake@3.13.4:", type="build", when="@3.9.0:") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("z3", type="link") depends_on("ncurses", type="link") diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 85b93788d6..2762c5781d 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -532,9 +532,9 @@ class Conduit(CMakePackage): if "+hdf5" in spec: cfg.write(cmake_cache_entry("HDF5_DIR", spec["hdf5"].prefix)) - if "zlib" in spec: + if "zlib-api" in spec: # HDF5 depends on zlib - cfg.write(cmake_cache_entry("ZLIB_DIR", spec["zlib"].prefix)) + cfg.write(cmake_cache_entry("ZLIB_DIR", spec["zlib-api"].prefix)) else: cfg.write("# hdf5 not built by spack \n") diff --git a/var/spack/repos/builtin/packages/cracklib/package.py b/var/spack/repos/builtin/packages/cracklib/package.py index 1b5d2f090f..82d8a411f3 100644 --- a/var/spack/repos/builtin/packages/cracklib/package.py +++ b/var/spack/repos/builtin/packages/cracklib/package.py @@ -22,7 +22,7 @@ class Cracklib(AutotoolsPackage): depends_on("python", type=("build", "run")) depends_on("gettext") depends_on("fmt") - depends_on("zlib") + depends_on("zlib-api") configure_directory = "src" diff --git a/var/spack/repos/builtin/packages/creduce/package.py b/var/spack/repos/builtin/packages/creduce/package.py index b7b01ada36..af70f77f9d 100644 --- a/var/spack/repos/builtin/packages/creduce/package.py +++ b/var/spack/repos/builtin/packages/creduce/package.py @@ -29,4 +29,4 @@ class Creduce(CMakePackage): depends_on("perl-getopt-tabular") depends_on("perl-regexp-common") depends_on("perl-termreadkey") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 220d63f394..f3d9169323 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -47,7 +47,7 @@ class Cube(AutotoolsPackage): depends_on("pkgconfig", type="build") depends_on("dbus") - depends_on("zlib") + depends_on("zlib-api") depends_on("qt@5:", when="@4.3.0: +gui") depends_on("qt@4.8:", when="@4.2.0:4.2 +gui") diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py index 8a37906d7b..713c301f2f 100644 --- a/var/spack/repos/builtin/packages/cubelib/package.py +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -43,7 +43,7 @@ class Cubelib(AutotoolsPackage): ) depends_on("pkgconfig", type="build") - depends_on("zlib") + depends_on("zlib-api") def url_for_version(self, version): url = "http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubelib-{1}.tar.gz" @@ -52,7 +52,7 @@ class Cubelib(AutotoolsPackage): def configure_args(self): configure_args = ["--enable-shared"] - configure_args.append("--with-frontend-zlib=%s" % self.spec["zlib"].prefix.lib) + configure_args.append("--with-frontend-zlib=%s" % self.spec["zlib-api"].prefix.lib) return configure_args def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py index 6b8aa96841..6674a7cf66 100644 --- a/var/spack/repos/builtin/packages/cubew/package.py +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -43,7 +43,7 @@ class Cubew(AutotoolsPackage): ) depends_on("pkgconfig", type="build") - depends_on("zlib") + depends_on("zlib-api") def url_for_version(self, version): url = "http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubew-{1}.tar.gz" @@ -52,8 +52,8 @@ class Cubew(AutotoolsPackage): def configure_args(self): configure_args = ["--enable-shared"] - configure_args.append("--with-frontend-zlib=%s" % self.spec["zlib"].prefix.lib) - configure_args.append("--with-backend-zlib=%s" % self.spec["zlib"].prefix.lib) + configure_args.append("--with-frontend-zlib=%s" % self.spec["zlib-api"].prefix.lib) + configure_args.append("--with-backend-zlib=%s" % self.spec["zlib-api"].prefix.lib) return configure_args diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 5b37ec74df..f67a2a55ac 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -286,7 +286,7 @@ class Curl(NMakePackage, AutotoolsPackage): depends_on("openssl@:1", when="@:7.76") depends_on("libidn2", when="+libidn2") - depends_on("zlib") + depends_on("zlib-api") depends_on("nghttp2", when="+nghttp2") depends_on("libssh2", when="+libssh2") depends_on("libssh", when="+libssh") @@ -336,7 +336,7 @@ class AutotoolsBuilder(AutotoolsBuilder): spec = self.spec args = [ - "--with-zlib=" + spec["zlib"].prefix, + "--with-zlib=" + spec["zlib-api"].prefix, # Prevent unintentional linking against system libraries: we could # add variants for these in the future "--without-brotli", @@ -425,7 +425,7 @@ class NMakeBuilder(NMakeBuilder): mode = "dll" if "libs=dll" in self.spec else "static" args.append("mode=%s" % mode) args.append("WITH_ZLIB=%s" % mode) - args.append("ZLIB_PATH=%s" % self.spec["zlib"].prefix) + args.append("ZLIB_PATH=%s" % self.spec["zlib-api"].prefix) if "+libssh" in self.spec: args.append("WITH_SSH=%s" % mode) if "+libssh2" in self.spec: diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index 74ced0d19d..1b4e06b591 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -50,7 +50,7 @@ class DarshanRuntime(AutotoolsPackage): version("3.0.0", sha256="95232710f5631bbf665964c0650df729c48104494e887442596128d189da43e0") depends_on("mpi", when="+mpi") - depends_on("zlib") + depends_on("zlib-api") depends_on("hdf5", when="+hdf5") depends_on("parallel-netcdf", when="+parallel-netcdf") depends_on("papi", when="+apxc") @@ -122,7 +122,7 @@ class DarshanRuntime(AutotoolsPackage): extra_args.append("--with-mem-align=8") extra_args.append("--with-log-path-by-env=DARSHAN_LOG_DIR_PATH") extra_args.append("--with-jobid-env=%s" % job_id) - extra_args.append("--with-zlib=%s" % spec["zlib"].prefix) + extra_args.append("--with-zlib=%s" % spec["zlib-api"].prefix) if "+mpi" in spec: extra_args.append("CC=%s" % self.spec["mpi"].mpicc) diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index e6986d0fe6..56f85a9f00 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -56,7 +56,7 @@ class DarshanUtil(AutotoolsPackage): "apxc", default=False, description="Compile with AutoPerf XC module support", when="@3.3:" ) - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2", when="+bzip2", type=("build", "link", "run")) depends_on("autoconf", type="build", when="@main") depends_on("automake", type="build", when="@main") @@ -78,7 +78,7 @@ class DarshanUtil(AutotoolsPackage): extra_args = [] extra_args.append("CC=%s" % self.compiler.cc) - extra_args.append("--with-zlib=%s" % spec["zlib"].prefix) + extra_args.append("--with-zlib=%s" % spec["zlib-api"].prefix) if "+apmpi" in spec: if self.version < Version("3.3.2"): extra_args.append("--enable-autoperf-apmpi") diff --git a/var/spack/repos/builtin/packages/dcmtk/package.py b/var/spack/repos/builtin/packages/dcmtk/package.py index 96c1870cdd..9a9c1ce98d 100644 --- a/var/spack/repos/builtin/packages/dcmtk/package.py +++ b/var/spack/repos/builtin/packages/dcmtk/package.py @@ -28,7 +28,7 @@ class Dcmtk(CMakePackage): default=True, description="Support 'Deflated Explicit VR Little Endian' Transfer Syntax", ) - depends_on("zlib", type=("build", "link"), when="+zlib") + depends_on("zlib-api", type=("build", "link"), when="+zlib") variant("tiff", default=True, description="Support for TIFF output") depends_on("libtiff", type=("build", "link"), when="+tiff") diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 469ce177f7..df6f514134 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -152,7 +152,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on(Boost.with_default_variants) depends_on("lapack") depends_on("suite-sparse") - depends_on("zlib") + depends_on("zlib-api") # Optional dependencies: Configuration depends_on("cuda@8:", when="+cuda") @@ -412,7 +412,7 @@ class Dealii(CMakePackage, CudaPackage): self.define("LAPACK_INCLUDE_DIRS", ";".join(lapack_blas_headers.directories)), self.define("LAPACK_LIBRARIES", lapack_blas_libs.joined(";")), self.define("UMFPACK_DIR", spec["suite-sparse"].prefix), - self.define("ZLIB_DIR", spec["zlib"].prefix), + self.define("ZLIB_DIR", spec["zlib-api"].prefix), self.define("DEAL_II_ALLOW_BUNDLED", False), ] ) diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py index 57c6d435f0..63860f4220 100644 --- a/var/spack/repos/builtin/packages/denovogear/package.py +++ b/var/spack/repos/builtin/packages/denovogear/package.py @@ -26,7 +26,7 @@ class Denovogear(CMakePackage): ) depends_on("htslib@1.2:", type=("build")) depends_on("eigen", type=("build")) - depends_on("zlib", type=("link")) + depends_on("zlib-api", type=("link")) patch("stream-open.patch", when="@:1.1.1") # fix: ordered comparison between pointer and zero. diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index f0fd7aa291..a97a341eb1 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -32,7 +32,7 @@ class Diamond(CMakePackage): version("0.8.38", sha256="582a7932f3aa73b0eac2275dd773818665f0b067b32a79ff5a13b0e3ca375f60") version("0.8.26", sha256="00d2be32dad76511a767ab8e917962c0ecc572bc808080be60dec028df45439f") - depends_on("zlib") + depends_on("zlib-api") conflicts("target=aarch64:", when="@:0.9.25") diff --git a/var/spack/repos/builtin/packages/digitrounding/package.py b/var/spack/repos/builtin/packages/digitrounding/package.py index 5360a31489..63c9632f0b 100644 --- a/var/spack/repos/builtin/packages/digitrounding/package.py +++ b/var/spack/repos/builtin/packages/digitrounding/package.py @@ -17,7 +17,7 @@ class Digitrounding(CMakePackage): version("master", branch="master") version("2020-02-27", commit="7b18679aded7a85e6f221f7f5cd4f080f322bc33") - depends_on("zlib") + depends_on("zlib-api") variant("shared", default=True, description="build shared libraries") diff --git a/var/spack/repos/builtin/packages/dire/package.py b/var/spack/repos/builtin/packages/dire/package.py index 152df2776b..145561456c 100644 --- a/var/spack/repos/builtin/packages/dire/package.py +++ b/var/spack/repos/builtin/packages/dire/package.py @@ -23,7 +23,7 @@ class Dire(Package): version("2.004", sha256="8cc1213b58fec744fdaa50834560a14b141de99efb2c3e3d3d47f3d6d84b179f") - depends_on("zlib") + depends_on("zlib-api") # TODO: replace this with an explicit list of components of Boost, # for instance depends_on('boost +filesystem') diff --git a/var/spack/repos/builtin/packages/dlib/package.py b/var/spack/repos/builtin/packages/dlib/package.py index 7c8f1a634b..0100a2379f 100644 --- a/var/spack/repos/builtin/packages/dlib/package.py +++ b/var/spack/repos/builtin/packages/dlib/package.py @@ -23,7 +23,7 @@ class Dlib(CMakePackage): variant("shared", default=True, description="build the shared libraries") - depends_on("zlib") + depends_on("zlib-api") depends_on("libpng") depends_on("libjpeg") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/ea-utils/package.py b/var/spack/repos/builtin/packages/ea-utils/package.py index b18e016fee..afd6611dd2 100644 --- a/var/spack/repos/builtin/packages/ea-utils/package.py +++ b/var/spack/repos/builtin/packages/ea-utils/package.py @@ -26,7 +26,7 @@ class EaUtils(MakefilePackage): ) depends_on("sparsehash") - depends_on("zlib") + depends_on("zlib-api") depends_on("gsl") depends_on("bamtools") depends_on("perl", type=["build", "run"]) diff --git a/var/spack/repos/builtin/packages/eagle/package.py b/var/spack/repos/builtin/packages/eagle/package.py index 9353da9042..3070c64439 100644 --- a/var/spack/repos/builtin/packages/eagle/package.py +++ b/var/spack/repos/builtin/packages/eagle/package.py @@ -17,7 +17,7 @@ class Eagle(MakefilePackage): version("1.1.2", sha256="afe967560d1f8fdbd0caf4b93b5f2a86830e9e4d399fee4a526140431343045e") depends_on("curl") - depends_on("zlib") + depends_on("zlib-api") depends_on("lzma") depends_on("htslib") diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index 05ad38f9b1..8d18055a4c 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -348,7 +348,7 @@ class Eccodes(CMakePackage): args.append(self.define("OPENJPEG_PATH", self.spec["openjpeg"].prefix)) if "+png" in self.spec: - args.append(self.define("ZLIB_ROOT", self.spec["zlib"].prefix)) + args.append(self.define("ZLIB_ROOT", self.spec["zlib-api"].prefix)) if "+aec" in self.spec: # Prevent overriding by environment variables AEC_DIR and AEC_PATH: diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index 56a21a7d63..231bb9a4c3 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -65,7 +65,7 @@ class Elfutils(AutotoolsPackage, SourcewarePackage): depends_on("bzip2", type="link") depends_on("xz", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("zstd", type="link", when="@0.182:") depends_on("gettext", when="+nls") @@ -112,7 +112,7 @@ class Elfutils(AutotoolsPackage, SourcewarePackage): args = [ "--with-bzlib=%s" % spec["bzip2"].prefix, "--with-lzma=%s" % spec["xz"].prefix, - "--with-zlib=%s" % spec["zlib"].prefix, + "--with-zlib=%s" % spec["zlib-api"].prefix, ] if "@0.182:" in spec: diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index be45473e8b..0e6415606d 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -48,7 +48,7 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): depends_on("ncurses") depends_on("pcre") - depends_on("zlib") + depends_on("zlib-api") depends_on("libxml2") depends_on("libtiff", when="+X") depends_on("libpng", when="+X") diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index 88eeb63504..19d7faae8b 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -29,7 +29,7 @@ class Er(CMakePackage): depends_on("rankstr", when="@0.0.4:") depends_on("redset") depends_on("shuffile") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("kvtree@:1.2.0", when="@:0.1.0") depends_on("kvtree@1.3.0", when="@0.2.0:0.3.0") diff --git a/var/spack/repos/builtin/packages/ethminer/package.py b/var/spack/repos/builtin/packages/ethminer/package.py index 9c8871e9ea..91b42ef93a 100644 --- a/var/spack/repos/builtin/packages/ethminer/package.py +++ b/var/spack/repos/builtin/packages/ethminer/package.py @@ -27,7 +27,7 @@ class Ethminer(CMakePackage): depends_on(Boost.with_default_variants) depends_on("json-c") depends_on("curl") - depends_on("zlib") + depends_on("zlib-api") depends_on("cuda", when="+cuda") depends_on("mesa", when="+opencl") diff --git a/var/spack/repos/builtin/packages/exempi/package.py b/var/spack/repos/builtin/packages/exempi/package.py index c193c4f03f..3a3f6be668 100644 --- a/var/spack/repos/builtin/packages/exempi/package.py +++ b/var/spack/repos/builtin/packages/exempi/package.py @@ -20,7 +20,7 @@ class Exempi(AutotoolsPackage): version("2.6.1", sha256="072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd") version("2.5.2", sha256="52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5") - depends_on("zlib") + depends_on("zlib-api") depends_on("iconv") # needs +test variant to prevent following error: # 118 checking for the Boost unit_test_framework library... no diff --git a/var/spack/repos/builtin/packages/exiv2/package.py b/var/spack/repos/builtin/packages/exiv2/package.py index e19d578a0a..b1509359da 100644 --- a/var/spack/repos/builtin/packages/exiv2/package.py +++ b/var/spack/repos/builtin/packages/exiv2/package.py @@ -20,5 +20,5 @@ class Exiv2(CMakePackage): version("0.27.3", sha256="6398bc743c32b85b2cb2a604273b8c90aa4eb0fd7c1700bf66cbb2712b4f00c1") version("0.27.2", sha256="3dbcaf01fbc5b98d42f091d1ff0d4b6cd9750dc724de3d9c0d113948570b2934") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("expat@2.2.6:", type="link") diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py index 4a3b1464d3..4dcd6d72d5 100644 --- a/var/spack/repos/builtin/packages/express/package.py +++ b/var/spack/repos/builtin/packages/express/package.py @@ -28,7 +28,7 @@ class Express(CMakePackage): "+atomic+container+math+thread+program_options" ) depends_on("bamtools") - depends_on("zlib") + depends_on("zlib-api") # patch from the debian package repo: # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811859 diff --git a/var/spack/repos/builtin/packages/fasta/package.py b/var/spack/repos/builtin/packages/fasta/package.py index be625a7384..763e6ec9db 100644 --- a/var/spack/repos/builtin/packages/fasta/package.py +++ b/var/spack/repos/builtin/packages/fasta/package.py @@ -26,7 +26,7 @@ class Fasta(MakefilePackage): url="https://github.com/wrpearson/fasta36/archive/refs/tags/v36.3.8h_04-May-2020.tar.gz", ) - depends_on("zlib") + depends_on("zlib-api") # The src tree includes a plethora of variant Makefiles and the # builder is expected to choose one that's appropriate. This'll diff --git a/var/spack/repos/builtin/packages/fastani/package.py b/var/spack/repos/builtin/packages/fastani/package.py index 24924a7c76..d5c9444005 100644 --- a/var/spack/repos/builtin/packages/fastani/package.py +++ b/var/spack/repos/builtin/packages/fastani/package.py @@ -25,4 +25,4 @@ class Fastani(CMakePackage, AutotoolsPackage): depends_on("libtool", type="build", when="build_system=autotools") depends_on("m4", type="build", when="build_system=autotools") depends_on("gsl", type=("build", "link")) - depends_on("zlib", type=("build", "link")) + depends_on("zlib-api", type=("build", "link")) diff --git a/var/spack/repos/builtin/packages/fastjar/package.py b/var/spack/repos/builtin/packages/fastjar/package.py index e11d68bb9a..e27320d50e 100644 --- a/var/spack/repos/builtin/packages/fastjar/package.py +++ b/var/spack/repos/builtin/packages/fastjar/package.py @@ -14,4 +14,4 @@ class Fastjar(AutotoolsPackage): version("0.98", sha256="f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/fastqvalidator/package.py b/var/spack/repos/builtin/packages/fastqvalidator/package.py index e7b312f55a..4679269808 100644 --- a/var/spack/repos/builtin/packages/fastqvalidator/package.py +++ b/var/spack/repos/builtin/packages/fastqvalidator/package.py @@ -20,7 +20,7 @@ class Fastqvalidator(MakefilePackage): commit="9db9c23e176a6ce6f421a3c21ccadedca892ac0c", ) - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") patch("chromosome.patch", when="@2017-01-10", working_dir="libStatGen") @property diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index 736812e242..e8e5f89cce 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -106,7 +106,7 @@ class Fenics(CMakePackage): depends_on("python@3.5:", type=("build", "run"), when="+python") depends_on("eigen@3.2.0:") depends_on("pkgconfig", type="build") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("boost+filesystem+program_options+system+iostreams+timer+regex+chrono") depends_on( diff --git a/var/spack/repos/builtin/packages/fermi/package.py b/var/spack/repos/builtin/packages/fermi/package.py index 23e71310eb..df03daa289 100644 --- a/var/spack/repos/builtin/packages/fermi/package.py +++ b/var/spack/repos/builtin/packages/fermi/package.py @@ -14,7 +14,7 @@ class Fermi(MakefilePackage): version("1.1", sha256="f1351b52a4ff40e5d708899e90ecf747e7af8d4eac795f6968e5b58c2ba11a67") - depends_on("zlib") + depends_on("zlib-api") depends_on("perl", type="run") depends_on("sse2neon", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/fermikit/package.py b/var/spack/repos/builtin/packages/fermikit/package.py index f8bb48f1d6..a17f9e8f3a 100644 --- a/var/spack/repos/builtin/packages/fermikit/package.py +++ b/var/spack/repos/builtin/packages/fermikit/package.py @@ -15,7 +15,7 @@ class Fermikit(MakefilePackage): version("2017-11-7", commit="bf9c7112221577ba110665bddca8f1987250bdc7", submodules=True) - depends_on("zlib") + depends_on("zlib-api") depends_on("sse2neon", when="target=aarch64:") patch("ksw_for_aarch64.patch", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/ferret/package.py b/var/spack/repos/builtin/packages/ferret/package.py index 09f08d6f81..0d7dc892ee 100644 --- a/var/spack/repos/builtin/packages/ferret/package.py +++ b/var/spack/repos/builtin/packages/ferret/package.py @@ -32,7 +32,7 @@ class Ferret(Package): depends_on("netcdf-c") depends_on("netcdf-fortran") depends_on("readline") - depends_on("zlib") + depends_on("zlib-api") depends_on("libx11") depends_on("curl") @@ -66,7 +66,7 @@ class Ferret(Package): hdf5_prefix = spec["hdf5"].prefix netcdff_prefix = spec["netcdf-fortran"].prefix readline_prefix = spec["readline"].prefix - libz_prefix = spec["zlib"].prefix + libz_prefix = spec["zlib-api"].prefix work_dir = "FERRET" if "@:7.2" in spec else "." with working_dir(work_dir, create=False): diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index fbbfb74613..26805d9743 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -77,7 +77,7 @@ class Ffmpeg(AutotoolsPackage): depends_on("alsa-lib", when="platform=linux") depends_on("iconv") depends_on("yasm@1.2.0:") - depends_on("zlib") + depends_on("zlib-api") depends_on("aom", when="+libaom") depends_on("bzip2", when="+bzlib") diff --git a/var/spack/repos/builtin/packages/file/package.py b/var/spack/repos/builtin/packages/file/package.py index 69609c0036..23394ab2ab 100644 --- a/var/spack/repos/builtin/packages/file/package.py +++ b/var/spack/repos/builtin/packages/file/package.py @@ -32,7 +32,7 @@ class File(AutotoolsPackage): depends_on("bzip2") depends_on("xz", when="@5.38:") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd", when="@5.44:") @classmethod diff --git a/var/spack/repos/builtin/packages/filtlong/package.py b/var/spack/repos/builtin/packages/filtlong/package.py index e9fc522b36..4b0acffe88 100644 --- a/var/spack/repos/builtin/packages/filtlong/package.py +++ b/var/spack/repos/builtin/packages/filtlong/package.py @@ -16,7 +16,7 @@ class Filtlong(MakefilePackage): version("0.2.0", sha256="a4afb925d7ced8d083be12ca58911bb16d5348754e7c2f6431127138338ee02a") version("0.1.1", sha256="ddae7a5850efeb64424965a443540b1ced34286fbefad9230ab71f4af314081b") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): mkdir(prefix.bin) diff --git a/var/spack/repos/builtin/packages/flash/package.py b/var/spack/repos/builtin/packages/flash/package.py index 9e72cdf528..78451f9ddf 100644 --- a/var/spack/repos/builtin/packages/flash/package.py +++ b/var/spack/repos/builtin/packages/flash/package.py @@ -16,7 +16,7 @@ class Flash(MakefilePackage): version("1.2.11", sha256="685ca6f7fedda07434d8ee03c536f4763385671c4509c5bb48beb3055fd236ac") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/flexi/package.py b/var/spack/repos/builtin/packages/flexi/package.py index 9a976d4d99..24bdbba1a7 100644 --- a/var/spack/repos/builtin/packages/flexi/package.py +++ b/var/spack/repos/builtin/packages/flexi/package.py @@ -97,7 +97,7 @@ class Flexi(CMakePackage): depends_on("hdf5+fortran+mpi", when="+mpi") depends_on("hdf5+fortran~mpi", when="~mpi") depends_on("lapack") - depends_on("zlib") + depends_on("zlib-api") depends_on("fftw", when="+channel_fft") def flag_handler(self, name, flags): diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index ac1c7be88e..ffd431f18a 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -76,7 +76,7 @@ class FoamExtend(Package): depends_on("mpi") depends_on("python") - depends_on("zlib") + depends_on("zlib-api") depends_on("flex", type="build") depends_on("cmake", type="build") @@ -261,7 +261,7 @@ class FoamExtend(Package): }, "flex": {"FLEX_SYSTEM": 1, "FLEX_DIR": spec["flex"].prefix}, "bison": {"BISON_SYSTEM": 1, "BISON_DIR": spec["flex"].prefix}, - "zlib": {"ZLIB_SYSTEM": 1, "ZLIB_DIR": spec["zlib"].prefix}, + "zlib": {"ZLIB_SYSTEM": 1, "ZLIB_DIR": spec["zlib-api"].prefix}, } # Adjust configuration via prefs - sort second self.etc_prefs["001"].update(self.foam_arch.foam_dict()) diff --git a/var/spack/repos/builtin/packages/form/package.py b/var/spack/repos/builtin/packages/form/package.py index cffb758552..13c303ca50 100644 --- a/var/spack/repos/builtin/packages/form/package.py +++ b/var/spack/repos/builtin/packages/form/package.py @@ -23,7 +23,7 @@ class Form(AutotoolsPackage): ) depends_on("gmp", type="link", when="+gmp") - depends_on("zlib", type="link", when="+zlib") + depends_on("zlib-api", type="link", when="+zlib") depends_on("mpi", type="link", when="+parform") variant("gmp", default=True, description="Use GMP for long integer arithmetic") @@ -35,7 +35,10 @@ class Form(AutotoolsPackage): def configure_args(self): args = [] args += self.with_or_without("gmp", "prefix") - args += self.with_or_without("zlib", "prefix") + if "+zlib" in self.spec: + args.append("--with-zlib=%s" % self.spec["zlib-api"].prefix) + else: + args.append("--without-zlib") args += self.enable_or_disable("scalar") args += self.enable_or_disable("threaded") args += self.enable_or_disable("parform") diff --git a/var/spack/repos/builtin/packages/fox/package.py b/var/spack/repos/builtin/packages/fox/package.py index b50623bcb1..2d0166e3fc 100644 --- a/var/spack/repos/builtin/packages/fox/package.py +++ b/var/spack/repos/builtin/packages/fox/package.py @@ -32,7 +32,7 @@ class Fox(AutotoolsPackage): depends_on("jpeg") depends_on("libpng") depends_on("libtiff") - depends_on("zlib") + depends_on("zlib-api") depends_on("libx11") depends_on("libsm") depends_on("libxft") diff --git a/var/spack/repos/builtin/packages/freebayes/package.py b/var/spack/repos/builtin/packages/freebayes/package.py index 89a3f7eb4d..f54c795521 100644 --- a/var/spack/repos/builtin/packages/freebayes/package.py +++ b/var/spack/repos/builtin/packages/freebayes/package.py @@ -24,13 +24,13 @@ class Freebayes(MesonPackage): ) depends_on("cmake", type="build") - depends_on("zlib") + depends_on("zlib-api") # Deps for @1.3.5 and beyond depends_on("ninja", type="build", when="@1.3.5:") depends_on("pkgconfig", type="build", when="@1.3.5:") depends_on("htslib", when="@1.3.5:") - depends_on("zlib", when="@1.3.5:") + depends_on("zlib-api", when="@1.3.5:") depends_on("xz", when="@1.3.5:") depends_on("parallel", when="@1.3.5:") depends_on("vcftools", when="@1.3.5:") diff --git a/var/spack/repos/builtin/packages/frontier-client/package.py b/var/spack/repos/builtin/packages/frontier-client/package.py index 616d1f0c8e..a25c0c854f 100644 --- a/var/spack/repos/builtin/packages/frontier-client/package.py +++ b/var/spack/repos/builtin/packages/frontier-client/package.py @@ -23,7 +23,7 @@ class FrontierClient(MakefilePackage): depends_on("pacparser") depends_on("expat") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") patch("frontier-client.patch", level=0) @@ -71,7 +71,7 @@ class FrontierClient(MakefilePackage): "PACPARSER_DIR=" + self.spec["pacparser"].prefix, "EXPAT_DIR=" + self.spec["expat"].prefix, "OPENSSL_DIR=" + self.spec["openssl"].prefix, - "ZLIB_DIR=" + self.spec["zlib"].prefix, + "ZLIB_DIR=" + self.spec["zlib-api"].prefix, ) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index d51984244a..e065b649ce 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -82,7 +82,7 @@ class Gaudi(CMakePackage): depends_on("py-xenv@1:", when="@:34.9", type=("build", "run")) depends_on("range-v3") depends_on("root +python +root7 +ssl +tbb +threads") - depends_on("zlib") + depends_on("zlib-api") # Testing dependencies # Note: gaudi only builds examples when testing enabled diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 1a48ad59f7..5bd047a13f 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -182,7 +182,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): depends_on("isl@0.15:0.20", when="@9:9.9") depends_on("isl@0.15:", when="@10:") - depends_on("zlib", when="@6:") + depends_on("zlib-api", when="@6:") depends_on("zstd", when="@10:") depends_on("diffutils", type="build") depends_on("iconv", when="platform=darwin") @@ -652,9 +652,11 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): # Use installed libz if self.version >= Version("6"): - filter_file("@zlibdir@", "-L{0}".format(spec["zlib"].prefix.lib), "gcc/Makefile.in") filter_file( - "@zlibinc@", "-I{0}".format(spec["zlib"].prefix.include), "gcc/Makefile.in" + "@zlibdir@", "-L{0}".format(spec["zlib-api"].prefix.lib), "gcc/Makefile.in" + ) + filter_file( + "@zlibinc@", "-I{0}".format(spec["zlib-api"].prefix.include), "gcc/Makefile.in" ) if spec.satisfies("+nvptx"): diff --git a/var/spack/repos/builtin/packages/gcta/package.py b/var/spack/repos/builtin/packages/gcta/package.py index f8c084d37a..538e26fe7d 100644 --- a/var/spack/repos/builtin/packages/gcta/package.py +++ b/var/spack/repos/builtin/packages/gcta/package.py @@ -29,7 +29,7 @@ class Gcta(CMakePackage): depends_on("eigen@3.3.1", when="@1.91.2") depends_on("eigen@3.3.7:", when="@1.94.0beta:") depends_on("boost@1.79:", when="@1.94.0beta:") - depends_on("zlib") + depends_on("zlib-api") depends_on("sqlite@3.3.1:", when="@1.94.0beta:") depends_on("zstd@1.4.4:", when="@1.94.0beta:") depends_on("spectra", when="@1.94.0beta:") diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index e3148638c3..1d4e72a8c4 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -250,7 +250,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): depends_on("proj@:6", when="@2.5:2") depends_on("proj@:5", when="@2.4") depends_on("proj@:4", when="@:2.3") - depends_on("zlib") + depends_on("zlib-api") depends_on("libtiff@4:", when="@3:") depends_on("libtiff@3.6.0:") # 3.9.0+ needed to pass testsuite depends_on("libgeotiff@1.5:", when="@3:") @@ -480,6 +480,10 @@ class CMakeBuilder(CMakeBuilder): self.define("GDAL_USE_JSONC", True), self.define("GDAL_USE_TIFF", True), self.define("GDAL_USE_ZLIB", True), + # zlib-ng + deflate64 doesn't compile (heavily relies on zlib) + # but since zlib-ng is faster than zlib, it deflate shouldn't + # be necessary. + self.define("ENABLE_DEFLATE64", "zlib-ng" not in self.spec), # Optional dependencies self.define_from_variant("GDAL_USE_ARMADILLO", "armadillo"), self.define_from_variant("GDAL_USE_ARROW", "arrow"), @@ -603,7 +607,7 @@ class AutotoolsBuilder(AutotoolsBuilder): "--with-geotiff={}".format(self.spec["libgeotiff"].prefix), "--with-libjson-c={}".format(self.spec["json-c"].prefix), "--with-libtiff={}".format(self.spec["libtiff"].prefix), - "--with-libz={}".format(self.spec["zlib"].prefix), + "--with-libz={}".format(self.spec["zlib-api"].prefix), # Optional dependencies self.with_or_without("armadillo", package="armadillo"), self.with_or_without("blosc", package="c-blosc"), diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 22f2673106..f4c4a54396 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -79,7 +79,7 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): # https://bugzilla.redhat.com/show_bug.cgi?id=1829702 depends_on("python@:3.8", when="@:9.2+python", type=("build", "link", "run")) depends_on("xz", when="+xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd", when="@13.1:") depends_on("source-highlight", when="+source-highlight") depends_on("ncurses", when="+tui") diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index efb3d9d137..aac83b7001 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -63,7 +63,7 @@ class GdkPixbuf(Package): depends_on("glib@2.38.0:") depends_on("jpeg") depends_on("libpng") - depends_on("zlib") + depends_on("zlib-api") depends_on("libtiff", when="+tiff") depends_on("gobject-introspection") depends_on("libx11", when="+x11") diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 76b6d1bef6..47a521955b 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -88,7 +88,7 @@ class Geant4(CMakePackage): depends_on("geant4-data@" + _vers, type="run", when="@" + _vers) depends_on("expat") - depends_on("zlib") + depends_on("zlib-api") depends_on("tbb", when="+tbb") depends_on("vtk@8.2:", when="+vtk") diff --git a/var/spack/repos/builtin/packages/gemma/package.py b/var/spack/repos/builtin/packages/gemma/package.py index a5596d32ad..625b30dfa2 100644 --- a/var/spack/repos/builtin/packages/gemma/package.py +++ b/var/spack/repos/builtin/packages/gemma/package.py @@ -18,7 +18,7 @@ class Gemma(MakefilePackage): version("0.98.5", sha256="3ed336deee29e370f96ec8f1a240f7b62550e57dcd1694245ce7ec8f42241677") - depends_on("zlib") + depends_on("zlib-api") # openblas is the default # other lapack implementors can be made to work # but must provide cblas, blas, and lapack libs diff --git a/var/spack/repos/builtin/packages/genrich/package.py b/var/spack/repos/builtin/packages/genrich/package.py index 74134b4800..93253354dd 100644 --- a/var/spack/repos/builtin/packages/genrich/package.py +++ b/var/spack/repos/builtin/packages/genrich/package.py @@ -15,7 +15,7 @@ class Genrich(MakefilePackage): version("0.6.1", sha256="2c70239e1caf33519b9e99142470bb4dd2f4c69e71f68cee33d6d6a1032d0e33") version("0.6", sha256="4c87aca8b7789f28b0c5c2c0ccea75668f19fa6a4cb38cd3c06d80ffd98d396f") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index 7a81c5e584..9e812e638f 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -38,7 +38,7 @@ class Ghostscript(AutotoolsPackage): depends_on("lcms") depends_on("libpng") depends_on("libtiff") - depends_on("zlib") + depends_on("zlib-api") depends_on("libxext") depends_on("gtkplus") @@ -81,7 +81,7 @@ class Ghostscript(AutotoolsPackage): filter_file( "ZLIBDIR=src", - "ZLIBDIR={0}".format(self.spec["zlib"].prefix.include), + "ZLIBDIR={0}".format(self.spec["zlib-api"].prefix.include), "configure.ac", "configure", string=True, diff --git a/var/spack/repos/builtin/packages/gimp/package.py b/var/spack/repos/builtin/packages/gimp/package.py index 3f79356dae..4d0c424150 100644 --- a/var/spack/repos/builtin/packages/gimp/package.py +++ b/var/spack/repos/builtin/packages/gimp/package.py @@ -81,7 +81,7 @@ class Gimp(AutotoolsPackage): depends_on("pango@1.29.4:") depends_on("poppler+glib") depends_on("poppler-data@0.4.7:") - depends_on("zlib") + depends_on("zlib-api") def url_for_version(self, version): # ref: https://download.gimp.org/gimp/v2.10/gimp-2.10.32.tar.bz2" diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index dfca4fe6a2..99a31ea0f1 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -428,7 +428,7 @@ class Git(AutotoolsPackage): depends_on("pcre", when="@:2.13") depends_on("pcre2", when="@2.14:") depends_on("perl", when="+perl") - depends_on("zlib") + depends_on("zlib-api") depends_on("openssh", type="run") depends_on("perl-alien-svn", type="run", when="+svn") depends_on("tk", type=("build", "link"), when="+tcltk") @@ -488,7 +488,7 @@ class Git(AutotoolsPackage): "--with-curl={0}".format(spec["curl"].prefix), "--with-expat={0}".format(spec["expat"].prefix), "--with-openssl={0}".format(spec["openssl"].prefix), - "--with-zlib={0}".format(spec["zlib"].prefix), + "--with-zlib={0}".format(spec["zlib-api"].prefix), ] if not self.spec["iconv"].name == "libc": diff --git a/var/spack/repos/builtin/packages/gl2ps/package.py b/var/spack/repos/builtin/packages/gl2ps/package.py index f70dcafd34..9e2973a166 100644 --- a/var/spack/repos/builtin/packages/gl2ps/package.py +++ b/var/spack/repos/builtin/packages/gl2ps/package.py @@ -26,7 +26,7 @@ class Gl2ps(CMakePackage): depends_on("gl") depends_on("libpng", when="+png") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("texlive", type="build", when="+doc") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/glfmultiples/package.py b/var/spack/repos/builtin/packages/glfmultiples/package.py index c8c8d2949f..b59997ed4b 100644 --- a/var/spack/repos/builtin/packages/glfmultiples/package.py +++ b/var/spack/repos/builtin/packages/glfmultiples/package.py @@ -19,7 +19,7 @@ class Glfmultiples(MakefilePackage): "2010-06-16", sha256="f7abef6f6b043e9052fb408bb2aae6d0d97d907aedc1b3e02dd0db08eb81b979" ) - depends_on("zlib") + depends_on("zlib-api") def edit(self, spec, prefix): makefile = FileFilter("Makefile") diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 9dde7c481e..e1744d1d23 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -136,7 +136,7 @@ class Glib(MesonPackage, AutotoolsPackage): depends_on("pkgconfig", type="build") depends_on("libffi") - depends_on("zlib") + depends_on("zlib-api") depends_on("gettext") depends_on("perl", type=("build", "run")) depends_on("python", type=("build", "run"), when="@2.53.4:") diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index 091ff71880..1d512aed62 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -56,7 +56,7 @@ class GmapGsnap(AutotoolsPackage): "2014-12-28", sha256="108433f3e3ea89b8117c8bb36d396913225caf1261d46ce6d89709ff1b44025d" ) - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") depends_on("perl", type="run") diff --git a/var/spack/repos/builtin/packages/gmic/package.py b/var/spack/repos/builtin/packages/gmic/package.py index 89d93b4263..af6a4cd37f 100644 --- a/var/spack/repos/builtin/packages/gmic/package.py +++ b/var/spack/repos/builtin/packages/gmic/package.py @@ -30,7 +30,7 @@ class Gmic(MakefilePackage): depends_on("libpng") depends_on("openexr") depends_on("opencv") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index ed8269ec36..78b4927391 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -88,7 +88,7 @@ class Gmsh(CMakePackage): depends_on("freetype", when="+oce") depends_on("freetype", when="+opencascade") depends_on("slepc", when="+slepc+petsc") - depends_on("zlib", when="+compression") + depends_on("zlib-api", when="+compression") depends_on("metis", when="+metis+external") depends_on("cgns", when="+cgns") depends_on("cgns~scoping", when="+cgns @:4.7.1") diff --git a/var/spack/repos/builtin/packages/gnina/package.py b/var/spack/repos/builtin/packages/gnina/package.py index 1de51c26b1..ab009f27ee 100644 --- a/var/spack/repos/builtin/packages/gnina/package.py +++ b/var/spack/repos/builtin/packages/gnina/package.py @@ -47,7 +47,7 @@ class Gnina(CMakePackage, CudaPackage): ] ) - depends_on("zlib") + depends_on("zlib-api") depends_on(_boost) depends_on("glog") depends_on("protobuf@:3.21.12") diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 4e31477f84..7d9b920644 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -123,7 +123,7 @@ class Gnupg(AutotoolsPackage): depends_on("libassuan@2.5:", when="@2.2.15:") depends_on("pinentry", type="run", when="@2:") depends_on("iconv", when="@2:") - depends_on("zlib") + depends_on("zlib-api") depends_on("gawk", type="build", when="@:1") # note: perl and curl are gnupg1 dependencies when keyserver support is @@ -143,7 +143,7 @@ class Gnupg(AutotoolsPackage): "--disable-bzip2", "--disable-ldap", "--disable-regex", - "--with-zlib=" + self.spec["zlib"].prefix, + "--with-zlib=" + self.spec["zlib-api"].prefix, "--without-tar", "--without-readline", ] diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 862b7846e7..2ffa13278d 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -41,7 +41,7 @@ class Gnutls(AutotoolsPackage): depends_on("nettle", when="@3.5:") depends_on("libidn2@:2.0", when="@:3.5") depends_on("libidn2") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("gettext") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/goshimmer/package.py b/var/spack/repos/builtin/packages/goshimmer/package.py index 92304e9fd8..c2ae6a7f9b 100644 --- a/var/spack/repos/builtin/packages/goshimmer/package.py +++ b/var/spack/repos/builtin/packages/goshimmer/package.py @@ -20,7 +20,7 @@ class Goshimmer(Package): depends_on("snappy") depends_on("rocksdb") depends_on("zstd") - depends_on("zlib") + depends_on("zlib-api") depends_on("lz4") @property diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py index ce03344bfa..ae6e17d2a0 100644 --- a/var/spack/repos/builtin/packages/gplates/package.py +++ b/var/spack/repos/builtin/packages/gplates/package.py @@ -45,7 +45,7 @@ class Gplates(CMakePackage): # Released before PROJ.6 was released, so assuming it's not supported depends_on("proj@4.6:5", when="@:2.1") depends_on("qwt@6.0.1:") - depends_on("zlib", when="@2.3:") + depends_on("zlib-api", when="@2.3:") # When built in parallel, headers are not generated before they are used # (specifically, ViewportWindowUi.h) with the Makefiles generator. diff --git a/var/spack/repos/builtin/packages/graphicsmagick/package.py b/var/spack/repos/builtin/packages/graphicsmagick/package.py index 23eda3e795..7d2c96f367 100644 --- a/var/spack/repos/builtin/packages/graphicsmagick/package.py +++ b/var/spack/repos/builtin/packages/graphicsmagick/package.py @@ -39,7 +39,7 @@ class Graphicsmagick(AutotoolsPackage): depends_on("libtool") depends_on("libxml2") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") def configure_args(self): args = ["--enable-shared"] diff --git a/var/spack/repos/builtin/packages/graphmap/package.py b/var/spack/repos/builtin/packages/graphmap/package.py index 22a568c7c1..4199da13d5 100644 --- a/var/spack/repos/builtin/packages/graphmap/package.py +++ b/var/spack/repos/builtin/packages/graphmap/package.py @@ -14,7 +14,7 @@ class Graphmap(MakefilePackage): version("0.3.0", commit="eb8c75d68b03be95464318afa69b645a59f8f6b7") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") def edit(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 743e8093ac..658a6a39b4 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -103,7 +103,7 @@ class Graphviz(AutotoolsPackage): depends_on(lang, when=("+" + lang)) # Feature dependencies - depends_on("zlib") + depends_on("zlib-api") depends_on("groff", type="build", when="+doc") depends_on("ghostscript", type="build", when="+doc") depends_on("expat", when="+expat") @@ -193,11 +193,15 @@ class Graphviz(AutotoolsPackage): "x", ]: args += self.with_or_without(var) - for var in ["zlib", "expat", "java"]: + for var in ("expat", "java"): if "+" + var in spec: args.append("--with-{0}includedir={1}".format(var, spec[var].prefix.include)) args.append("--with-{0}libdir={1}".format(var, spec[var].prefix.lib)) + if "+zlib" in spec: + args.append("--with-zlibincludedir={}".format(spec["zlib-api"].prefix.include)) + args.append("--with-zliblibdir={}".format(spec["zlib-api"].prefix.lib)) + args.append("--{0}-gtk".format("with" if "+gtkplus" in spec else "without")) if spec.version >= Version("2.46"): diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index c2957217b3..5a229cea0f 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -57,7 +57,7 @@ class Grass(AutotoolsPackage): # General requirements depends_on("gmake@3.81:", type="build") depends_on("iconv") - depends_on("zlib") + depends_on("zlib-api") depends_on("flex", type="build") depends_on("bison", type="build") depends_on("proj") diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index 0b517818f7..d798318e7e 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -129,7 +129,7 @@ class GribApi(CMakePackage): args.append("-DOPENJPEG_PATH=" + self.spec["openjpeg"].prefix) if "+png" in self.spec: - args.extend(["-DENABLE_PNG=ON", "-DZLIB_ROOT=" + self.spec["zlib"].prefix]) + args.extend(["-DENABLE_PNG=ON", "-DZLIB_ROOT=" + self.spec["zlib-api"].prefix]) else: args.append("-DENABLE_PNG=OFF") diff --git a/var/spack/repos/builtin/packages/grib-util/package.py b/var/spack/repos/builtin/packages/grib-util/package.py index ee4371b1b8..0304ac0b54 100644 --- a/var/spack/repos/builtin/packages/grib-util/package.py +++ b/var/spack/repos/builtin/packages/grib-util/package.py @@ -23,7 +23,7 @@ class GribUtil(CMakePackage): depends_on("jasper") depends_on("libpng") - depends_on("zlib") + depends_on("zlib-api") depends_on("w3emc", when="@1.2.4:") depends_on("w3nco", when="@:1.2.3") depends_on("g2") diff --git a/var/spack/repos/builtin/packages/grpc/package.py b/var/spack/repos/builtin/packages/grpc/package.py index fb80eb3327..dd7f3f5acf 100644 --- a/var/spack/repos/builtin/packages/grpc/package.py +++ b/var/spack/repos/builtin/packages/grpc/package.py @@ -56,7 +56,7 @@ class Grpc(CMakePackage): depends_on("protobuf") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") depends_on("c-ares") depends_on("abseil-cpp", when="@1.27:") depends_on("re2+pic", when="@1.33.1:") diff --git a/var/spack/repos/builtin/packages/hapcut2/package.py b/var/spack/repos/builtin/packages/hapcut2/package.py index 33b6c00807..c025fb3df8 100644 --- a/var/spack/repos/builtin/packages/hapcut2/package.py +++ b/var/spack/repos/builtin/packages/hapcut2/package.py @@ -28,7 +28,7 @@ class Hapcut2(MakefilePackage): depends_on("openssl") depends_on("xz") depends_on("bzip2") - depends_on("zlib") + depends_on("zlib-api") @when("@v1.3.1:") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index 2f44b0a6a4..2e1e173ffe 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -80,7 +80,7 @@ class Harfbuzz(MesonPackage, AutotoolsPackage): depends_on("icu4c") depends_on("freetype") depends_on("cairo+pdf+ft") - depends_on("zlib") + depends_on("zlib-api") depends_on("graphite2", when="+graphite2") conflicts( diff --git a/var/spack/repos/builtin/packages/hdf-eos2/package.py b/var/spack/repos/builtin/packages/hdf-eos2/package.py index 49e9acff6b..6b45c9c630 100644 --- a/var/spack/repos/builtin/packages/hdf-eos2/package.py +++ b/var/spack/repos/builtin/packages/hdf-eos2/package.py @@ -95,6 +95,6 @@ class HdfEos2(AutotoolsPackage): if "libszip" in self.spec: extra_args.append("--with-szlib={0}".format(self.spec["libszip"].prefix)) if "zlib" in self.spec: - extra_args.append("--with-zlib={0}".format(self.spec["zlib"].prefix)) + extra_args.append("--with-zlib={0}".format(self.spec["zlib-api"].prefix)) return extra_args diff --git a/var/spack/repos/builtin/packages/hdf-eos5/package.py b/var/spack/repos/builtin/packages/hdf-eos5/package.py index 12cdd06aff..258291ec3a 100644 --- a/var/spack/repos/builtin/packages/hdf-eos5/package.py +++ b/var/spack/repos/builtin/packages/hdf-eos5/package.py @@ -99,7 +99,7 @@ class HdfEos5(AutotoolsPackage): extra_args.append("--with-hdf5={0}".format(self.spec["hdf5"].prefix)) if "szip" in self.spec: extra_args.append("--with-szlib={0}".format(self.spec["szip"].prefix)) - if "zlib" in self.spec: - extra_args.append("--with-zlib={0}".format(self.spec["zlib"].prefix)) + if "zlib-api" in self.spec: + extra_args.append("--with-zlib={0}".format(self.spec["zlib-api"].prefix)) return extra_args diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py index ab929bed60..414e21e1e2 100644 --- a/var/spack/repos/builtin/packages/hdf/package.py +++ b/var/spack/repos/builtin/packages/hdf/package.py @@ -35,7 +35,7 @@ class Hdf(AutotoolsPackage): variant("shared", default=False, description="Enable shared library") variant("pic", default=True, description="Produce position-independent code") - depends_on("zlib@1.1.4:") + depends_on("zlib-api") depends_on("jpeg") depends_on("szip", when="+szip") depends_on("rpc", when="+external-xdr") @@ -158,7 +158,7 @@ class Hdf(AutotoolsPackage): config_args = [ "--enable-production", "--enable-static", - "--with-zlib=%s" % self.spec["zlib"].prefix, + "--with-zlib=%s" % self.spec["zlib-api"].prefix, "--with-jpeg=%s" % self.spec["jpeg"].prefix, ] diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 49a0723214..a896c30252 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -213,7 +213,7 @@ class Hdf5(CMakePackage): depends_on("mpi", when="+mpi") depends_on("java", type=("build", "run"), when="+java") depends_on("szip", when="+szip") - depends_on("zlib@1.1.2:") + depends_on("zlib-api") # The compiler wrappers (h5cc, h5fc, etc.) run 'pkg-config'. # Skip this on Windows since pkgconfig is autotools diff --git a/var/spack/repos/builtin/packages/heaptrack/package.py b/var/spack/repos/builtin/packages/heaptrack/package.py index 6cd2d96895..35e8489042 100644 --- a/var/spack/repos/builtin/packages/heaptrack/package.py +++ b/var/spack/repos/builtin/packages/heaptrack/package.py @@ -20,7 +20,7 @@ class Heaptrack(CMakePackage): depends_on("cmake@2.8.9:", type="build") depends_on("elfutils") depends_on("libunwind") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/heasoft/package.py b/var/spack/repos/builtin/packages/heasoft/package.py index cad00f057d..750be26df8 100644 --- a/var/spack/repos/builtin/packages/heasoft/package.py +++ b/var/spack/repos/builtin/packages/heasoft/package.py @@ -29,7 +29,7 @@ class Heasoft(AutotoolsPackage): variant("X", default=True, description="Enable X11 support") - depends_on("zlib") + depends_on("zlib-api") depends_on("ncurses") depends_on("curl") depends_on("libxt", when="+X") @@ -97,8 +97,8 @@ class Heasoft(AutotoolsPackage): def configure_args(self): config_args = [ "--with-png={0}".format(self.spec["libpng"].prefix), - "CPPFLAGS={0}".format(self.spec["zlib"].headers.include_flags), - "LDFLAGS={0}".format(self.spec["zlib"].libs.search_flags), + "CPPFLAGS={0}".format(self.spec["zlib-api"].headers.include_flags), + "LDFLAGS={0}".format(self.spec["zlib-api"].libs.search_flags), ] config_args += self.enable_or_disable("x", variant="X") diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 1e342f326a..118cec1eb3 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -134,7 +134,7 @@ class Hpctoolkit(AutotoolsPackage): depends_on("xerces-c transcoder=iconv") depends_on("xz+pic libs=static", type="link") depends_on("yaml-cpp@0.7.0: +shared", when="@2022.10:") - depends_on("zlib+shared") + depends_on("zlib-api+shared") depends_on("cuda", when="+cuda") depends_on("oneapi-level-zero", when="+level_zero") @@ -204,7 +204,7 @@ class Hpctoolkit(AutotoolsPackage): "--with-libunwind=%s" % spec["libunwind"].prefix, "--with-xerces=%s" % spec["xerces-c"].prefix, "--with-lzma=%s" % spec["xz"].prefix, - "--with-zlib=%s" % spec["zlib"].prefix, + "--with-zlib=%s" % spec["zlib-api"].prefix, ] if spec.satisfies("@2022.10:"): diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index 562155ebc3..1a2ce25a04 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -152,7 +152,7 @@ class HsakmtRoct(CMakePackage): self.spec["numactl"].prefix, self.spec["pkgconfig"].prefix, self.spec["llvm-amdgpu"].prefix, - self.spec["zlib"].prefix, + self.spec["zlib-api"].prefix, self.spec["ncurses"].prefix, ] ) diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index e97639abbb..25caf70806 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -42,7 +42,7 @@ class Htslib(AutotoolsPackage): description="use libdeflate for faster crc and deflate algorithms", ) - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2", when="@1.4:") depends_on("xz", when="@1.4:") depends_on("curl", when="@1.3:+libcurl") diff --git a/var/spack/repos/builtin/packages/icarus/package.py b/var/spack/repos/builtin/packages/icarus/package.py index e6e39561cc..b290cd9fed 100644 --- a/var/spack/repos/builtin/packages/icarus/package.py +++ b/var/spack/repos/builtin/packages/icarus/package.py @@ -22,7 +22,7 @@ class Icarus(AutotoolsPackage): depends_on("flex", type="build") depends_on("gperf @3.0:", type="build") depends_on("readline @4.2:", type=("build", "link")) - depends_on("zlib", type=("build", "link")) + depends_on("zlib-api", type=("build", "link")) patch("fix-gcc-10.patch", when="@v10_3") diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index 04ed8ad572..f5a191e344 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -69,7 +69,7 @@ class Icedtea(AutotoolsPackage): depends_on("libpng") depends_on("jpeg") depends_on("lcms") - depends_on("zlib") + depends_on("zlib-api") depends_on("alsa-lib", when="platform=linux") provides("java@8", when="@3.4.0:3") diff --git a/var/spack/repos/builtin/packages/id3lib/package.py b/var/spack/repos/builtin/packages/id3lib/package.py index fb16fc0445..35395b80bb 100644 --- a/var/spack/repos/builtin/packages/id3lib/package.py +++ b/var/spack/repos/builtin/packages/id3lib/package.py @@ -14,7 +14,7 @@ class Id3lib(AutotoolsPackage): version("3.8.3", sha256="2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079") - depends_on("zlib") + depends_on("zlib-api") # http://connie.slackware.com/~alien/slackbuilds/id3lib/build/id3lib-3.8.3_gcc4.diff # this is due to some changes in the c++ standard library headers diff --git a/var/spack/repos/builtin/packages/iq-tree/package.py b/var/spack/repos/builtin/packages/iq-tree/package.py index 8c548da2e1..356dcae0cd 100644 --- a/var/spack/repos/builtin/packages/iq-tree/package.py +++ b/var/spack/repos/builtin/packages/iq-tree/package.py @@ -29,7 +29,7 @@ class IqTree(CMakePackage): depends_on("boost+container+math+exception") depends_on("eigen") - depends_on("zlib") + depends_on("zlib-api") depends_on("mpi", when="+mpi") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/iqtree2/package.py b/var/spack/repos/builtin/packages/iqtree2/package.py index 67a14b8f58..c84cb6e8e6 100644 --- a/var/spack/repos/builtin/packages/iqtree2/package.py +++ b/var/spack/repos/builtin/packages/iqtree2/package.py @@ -18,4 +18,4 @@ class Iqtree2(CMakePackage): depends_on("boost", type="link") depends_on("eigen", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py index 1c8263d3a9..1da8faa0fd 100644 --- a/var/spack/repos/builtin/packages/ispc/package.py +++ b/var/spack/repos/builtin/packages/ispc/package.py @@ -41,7 +41,7 @@ class Ispc(CMakePackage): depends_on("bison", type="build") depends_on("flex", type="build") depends_on("ncurses", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("tbb", type="link", when="platform=linux @1.20:") depends_on("llvm+clang") depends_on("llvm libcxx=none", when="platform=darwin") diff --git a/var/spack/repos/builtin/packages/itk/package.py b/var/spack/repos/builtin/packages/itk/package.py index 875683149a..bd20a28d3d 100644 --- a/var/spack/repos/builtin/packages/itk/package.py +++ b/var/spack/repos/builtin/packages/itk/package.py @@ -63,7 +63,7 @@ class Itk(CMakePackage): depends_on("libpng") depends_on("libtiff") depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") def cmake_args(self): use_mkl = "^mkl" in self.spec diff --git a/var/spack/repos/builtin/packages/jhpcn-df/package.py b/var/spack/repos/builtin/packages/jhpcn-df/package.py index ebe14cead5..6854ced077 100644 --- a/var/spack/repos/builtin/packages/jhpcn-df/package.py +++ b/var/spack/repos/builtin/packages/jhpcn-df/package.py @@ -26,7 +26,7 @@ class JhpcnDf(CMakePackage): variant("lz4", default=False, description="Enable lz4") variant("fortran", default=False, description="Enable Fortran Interface") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("lz4@:1.7", when="+lz4", type="link") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/jose/package.py b/var/spack/repos/builtin/packages/jose/package.py index 3b7e2c1609..47f4678733 100644 --- a/var/spack/repos/builtin/packages/jose/package.py +++ b/var/spack/repos/builtin/packages/jose/package.py @@ -18,5 +18,5 @@ class Jose(AutotoolsPackage): depends_on("pkgconfig", type="build") depends_on("jansson@2.10:") - depends_on("zlib") + depends_on("zlib-api") depends_on("openssl@1.0.2:") diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index b2d45977f9..515b4ef170 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -185,7 +185,8 @@ class Julia(MakefilePackage): depends_on("suite-sparse +pic") depends_on("unwind") depends_on("utf8proc") - depends_on("zlib +shared +pic +optimize") + depends_on("zlib-api") + depends_on("zlib +shared +pic +optimize", when="^zlib") # Patches for julia patch("julia-1.6-system-libwhich-and-p7zip-symlink.patch", when="@1.6.0:1.6") @@ -252,7 +253,6 @@ class Julia(MakefilePackage): "pcre2", "suite-sparse", "utf8proc", - "zlib", ] if "+openlibm" in self.spec: pkgs.append("openlibm") @@ -261,6 +261,8 @@ class Julia(MakefilePackage): for pkg in pkgs: for dir in self.spec[pkg].libs.directories: env.prepend_path(linker_var, dir) + for dir in self.spec["zlib-api"].libs.directories: + env.prepend_path(linker_var, dir) def edit(self, spec, prefix): # TODO: use a search query for blas / lapack? diff --git a/var/spack/repos/builtin/packages/k8/package.py b/var/spack/repos/builtin/packages/k8/package.py index 81a756f857..9ca18bf678 100644 --- a/var/spack/repos/builtin/packages/k8/package.py +++ b/var/spack/repos/builtin/packages/k8/package.py @@ -17,7 +17,7 @@ class K8(Package): version("0.2.4", sha256="da8a99c7f1ce7f0cb23ff07ce10510e770686b906d5431442a5439743c0b3c47") - depends_on("zlib", type="run") + depends_on("zlib-api", type="run") def install(self, spec, prefix): if sys.platform == "darwin": diff --git a/var/spack/repos/builtin/packages/kallisto/package.py b/var/spack/repos/builtin/packages/kallisto/package.py index 85e4740f93..2e8cc2da93 100644 --- a/var/spack/repos/builtin/packages/kallisto/package.py +++ b/var/spack/repos/builtin/packages/kallisto/package.py @@ -20,7 +20,7 @@ class Kallisto(CMakePackage): # HDF5 support is optional beginning with version 0.46.2. variant("hdf5", when="@0.46.2:", default=False, description="Build with HDF5 support") - depends_on("zlib") + depends_on("zlib-api") depends_on("hdf5", when="@:0.43") depends_on("hdf5", when="+hdf5") diff --git a/var/spack/repos/builtin/packages/kassiopeia/package.py b/var/spack/repos/builtin/packages/kassiopeia/package.py index a09be3bb81..004d477568 100644 --- a/var/spack/repos/builtin/packages/kassiopeia/package.py +++ b/var/spack/repos/builtin/packages/kassiopeia/package.py @@ -41,7 +41,7 @@ class Kassiopeia(CMakePackage): variant("boost", default=False, description="Build Boost dependent modules") depends_on("cmake@3.13:", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("root@6.0.0:", when="+root") depends_on("vtk@6.1:", when="+vtk") depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin/packages/kcov/package.py b/var/spack/repos/builtin/packages/kcov/package.py index 86ca3950cc..2c7a400937 100644 --- a/var/spack/repos/builtin/packages/kcov/package.py +++ b/var/spack/repos/builtin/packages/kcov/package.py @@ -17,7 +17,7 @@ class Kcov(CMakePackage): version("38", sha256="b37af60d81a9b1e3b140f9473bdcb7975af12040feb24cc666f9bb2bb0be68b4") depends_on("cmake@2.8.4:", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("curl") depends_on("elfutils", when="platform=linux") depends_on("binutils +libiberty", when="platform=linux", type="link") diff --git a/var/spack/repos/builtin/packages/keepassxc/package.py b/var/spack/repos/builtin/packages/keepassxc/package.py index baf67627c8..2ecc7d894d 100644 --- a/var/spack/repos/builtin/packages/keepassxc/package.py +++ b/var/spack/repos/builtin/packages/keepassxc/package.py @@ -35,7 +35,7 @@ class Keepassxc(CMakePackage): # The following libraries are required: depends_on("qt+dbus~framework@5.2:") depends_on("libgcrypt@1.6:", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("minizip", when="+autotype") depends_on("libmicrohttpd", type="link") depends_on("libsodium@1.0.12:", type="link") diff --git a/var/spack/repos/builtin/packages/kitty/package.py b/var/spack/repos/builtin/packages/kitty/package.py index 47e068a474..ee21b7ecc7 100644 --- a/var/spack/repos/builtin/packages/kitty/package.py +++ b/var/spack/repos/builtin/packages/kitty/package.py @@ -33,7 +33,7 @@ class Kitty(Package): depends_on("python@3.5:", type=("build", "run")) depends_on("harfbuzz@1.5.0:") depends_on("libxkbcommon@0.5:") - depends_on("zlib") + depends_on("zlib-api") depends_on("libpng") depends_on("gl", type=("build", "link", "run")) depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/kmergenie/package.py b/var/spack/repos/builtin/packages/kmergenie/package.py index 96e3e42eff..f7ed2aaab1 100644 --- a/var/spack/repos/builtin/packages/kmergenie/package.py +++ b/var/spack/repos/builtin/packages/kmergenie/package.py @@ -18,7 +18,7 @@ class Kmergenie(MakefilePackage): depends_on("python", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) depends_on("r", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): install_tree(self.stage.source_path, prefix.bin) diff --git a/var/spack/repos/builtin/packages/krakenuniq/package.py b/var/spack/repos/builtin/packages/krakenuniq/package.py index e092c783f1..44171008af 100644 --- a/var/spack/repos/builtin/packages/krakenuniq/package.py +++ b/var/spack/repos/builtin/packages/krakenuniq/package.py @@ -26,7 +26,7 @@ class Krakenuniq(Package): variant("jellyfish", default=False, description="Install jellyfish v1.1.") depends_on("bzip2") - depends_on("zlib") + depends_on("zlib-api") depends_on("wget", when="+jellyfish") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index 4b14714b78..8177e76c8f 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -26,7 +26,7 @@ class Kvtree(CMakePackage): version("1.0.3", sha256="c742cdb1241ef4cb13767019204d5350a3c4383384bed9fb66680b93ff44b0d4") version("1.0.2", sha256="56fb5b747758c24a907a8380e8748d296900d94de9547bc15f6b427ac4ae2ec4") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") variant("mpi", default=True, description="Build with MPI message packing") depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 9872ed7699..cf258955e2 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -300,7 +300,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("py-protobuf+cpp@3.10.0:", type=("build", "run"), when="@:0.90,0.99: +pfe") depends_on("protobuf+shared@3.10.0:", when="@:0.90,0.99:") - depends_on("zlib", when="protobuf@3.11.0:") + depends_on("zlib-api", when="protobuf@3.11.0:") # using cereal@1.3.1 and above requires changing the # find_package call to lowercase, so stick with :1.3.0 diff --git a/var/spack/repos/builtin/packages/lcms/package.py b/var/spack/repos/builtin/packages/lcms/package.py index ed6907618a..4620a208a5 100644 --- a/var/spack/repos/builtin/packages/lcms/package.py +++ b/var/spack/repos/builtin/packages/lcms/package.py @@ -25,7 +25,7 @@ class Lcms(AutotoolsPackage): depends_on("jpeg") depends_on("libtiff") - depends_on("zlib") + depends_on("zlib-api") @property def libs(self): diff --git a/var/spack/repos/builtin/packages/ldak/package.py b/var/spack/repos/builtin/packages/ldak/package.py index 941b04955b..022a3beacb 100644 --- a/var/spack/repos/builtin/packages/ldak/package.py +++ b/var/spack/repos/builtin/packages/ldak/package.py @@ -16,7 +16,7 @@ class Ldak(Package): variant("mkl", default=False, description="Use MKL") - depends_on("zlib") + depends_on("zlib-api") depends_on("blas") depends_on("lapack") depends_on("mkl", when="+mkl") diff --git a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py index e41ad9ae24..68e0e36c9b 100644 --- a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py @@ -25,7 +25,7 @@ class LdcBootstrap(CMakePackage): version("0.17.4", sha256="48428afde380415640f3db4e38529345f3c8485b1913717995547f907534c1c3") depends_on("llvm@3.7:") - depends_on("zlib") + depends_on("zlib-api") depends_on("libconfig") depends_on("curl") depends_on("libedit") diff --git a/var/spack/repos/builtin/packages/ldc/package.py b/var/spack/repos/builtin/packages/ldc/package.py index 9d843221e7..af76fcc519 100644 --- a/var/spack/repos/builtin/packages/ldc/package.py +++ b/var/spack/repos/builtin/packages/ldc/package.py @@ -24,7 +24,7 @@ class Ldc(CMakePackage): variant("shared", default=True, description="Build runtime and tooling as shared libs") depends_on("llvm@3.9:") - depends_on("zlib") + depends_on("zlib-api") depends_on("libconfig") depends_on("curl") depends_on("libedit") diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index 51bf247ce3..5304d74799 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -105,7 +105,7 @@ class Legion(CMakePackage, ROCmPackage): depends_on("py-cffi", when="+python") depends_on("py-numpy", when="+python") depends_on("papi", when="+papi") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") # A C++ standard variant to work-around some odd behaviors with apple-clang # but this might be helpful for other use cases down the road. Legion's diff --git a/var/spack/repos/builtin/packages/leptonica/package.py b/var/spack/repos/builtin/packages/leptonica/package.py index 5a74572ca1..ffe6f6b093 100644 --- a/var/spack/repos/builtin/packages/leptonica/package.py +++ b/var/spack/repos/builtin/packages/leptonica/package.py @@ -23,7 +23,7 @@ class Leptonica(CMakePackage): depends_on("jpeg") depends_on("libpng") depends_on("libtiff") - depends_on("zlib") + depends_on("zlib-api") depends_on("libwebp+libwebpmux+libwebpdemux") depends_on("openjpeg") diff --git a/var/spack/repos/builtin/packages/lfortran/package.py b/var/spack/repos/builtin/packages/lfortran/package.py index 6b9b42216d..0f574f0c85 100644 --- a/var/spack/repos/builtin/packages/lfortran/package.py +++ b/var/spack/repos/builtin/packages/lfortran/package.py @@ -24,7 +24,7 @@ class Lfortran(CMakePackage): depends_on("python@3:", type="build", when="@main") depends_on("cmake", type="build") depends_on("llvm@11:15", type=("build", "run"), when="+llvm") - depends_on("zlib", type="build") + depends_on("zlib-api") depends_on("re2c", type="build", when="@main") depends_on("bison@:3.4", type="build", when="@main") depends_on("binutils@2.38:", type="build", when="platform=linux") diff --git a/var/spack/repos/builtin/packages/lftp/package.py b/var/spack/repos/builtin/packages/lftp/package.py index 6c8df1ad09..3e1e296930 100644 --- a/var/spack/repos/builtin/packages/lftp/package.py +++ b/var/spack/repos/builtin/packages/lftp/package.py @@ -25,14 +25,14 @@ class Lftp(AutotoolsPackage): depends_on("ncurses") depends_on("openssl") depends_on("readline") - depends_on("zlib") + depends_on("zlib-api") def configure_args(self): args = [ "--with-expat={0}".format(self.spec["expat"].prefix), "--with-openssl={0}".format(self.spec["openssl"].prefix), "--with-readline={0}".format(self.spec["readline"].prefix), - "--with-zlib={0}".format(self.spec["zlib"].prefix), + "--with-zlib={0}".format(self.spec["zlib-api"].prefix), "--disable-dependency-tracking", ] if self.spec["iconv"].name == "libc": diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index c86bf2f4d2..d6cdbf3f9b 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -100,7 +100,7 @@ class Libarchive(AutotoolsPackage): depends_on("lz4", when="compression=lz4") depends_on("lzo", when="compression=lzo2") depends_on("xz", when="compression=lzma") - depends_on("zlib", when="compression=zlib") + depends_on("zlib-api", when="compression=zlib") depends_on("zstd", when="compression=zstd") depends_on("nettle", when="crypto=nettle") diff --git a/var/spack/repos/builtin/packages/libcuml/package.py b/var/spack/repos/builtin/packages/libcuml/package.py index 11f772644e..67af9b46f1 100644 --- a/var/spack/repos/builtin/packages/libcuml/package.py +++ b/var/spack/repos/builtin/packages/libcuml/package.py @@ -17,7 +17,7 @@ class Libcuml(CMakePackage): version("0.15.0", sha256="5c9c656ae4eaa94a426e07d7385fd5ea0e5dc7abff806af2941aee10d4ca99c7") depends_on("cmake@3.14:", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("libcudf@0.8:") depends_on("cuda@9.2:") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/libdeflate/package.py b/var/spack/repos/builtin/packages/libdeflate/package.py index 34f8751c43..91d823f55a 100644 --- a/var/spack/repos/builtin/packages/libdeflate/package.py +++ b/var/spack/repos/builtin/packages/libdeflate/package.py @@ -26,7 +26,7 @@ class Libdeflate(MakefilePackage, CMakePackage): default="cmake", ) - depends_on("zlib") + depends_on("zlib-api") depends_on("gzip") with when("build_system=cmake"): diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 3da923e73a..93659acd0c 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -35,7 +35,7 @@ class Libdwarf(Package): version("20130126", sha256="c23c847935f8612f4fcdcfa0b3311f1553dcbd95bb683d3d5e030440201192fe") depends_on("elfutils@0.163", when="@20160507", type="link") depends_on("elf", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") parallel = False @@ -63,7 +63,7 @@ class Libdwarf(Package): configure("--prefix=" + prefix, "--enable-shared", *extra_config_args) filter_file( r"^dwfzlib\s*=\s*-lz", - "dwfzlib=-L{0} -lz".format(self.spec["zlib"].prefix.lib), + "dwfzlib=-L{0} -lz".format(self.spec["zlib-api"].prefix.lib), "Makefile", ) make() @@ -94,7 +94,7 @@ class Libdwarf(Package): configure("--prefix=" + prefix) filter_file( r"^dwfzlib\s*=\s*-lz", - "dwfzlib=-L{0} -lz".format(self.spec["zlib"].prefix.lib), + "dwfzlib=-L{0} -lz".format(self.spec["zlib-api"].prefix.lib), "Makefile", ) diff --git a/var/spack/repos/builtin/packages/libfontenc/package.py b/var/spack/repos/builtin/packages/libfontenc/package.py index 60f3e5f7e7..58eecb3496 100644 --- a/var/spack/repos/builtin/packages/libfontenc/package.py +++ b/var/spack/repos/builtin/packages/libfontenc/package.py @@ -15,7 +15,7 @@ class Libfontenc(AutotoolsPackage, XorgPackage): version("1.1.7", sha256="5e5f210329823f08f97bfe9fd5b4105070c789bc5aef88ce01d86d8203d4aa9f") version("1.1.3", sha256="6fba26760ca8d5045f2b52ddf641c12cedc19ee30939c6478162b7db8b6220fb") - depends_on("zlib") + depends_on("zlib-api") depends_on("xproto") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/libgeotiff/package.py b/var/spack/repos/builtin/packages/libgeotiff/package.py index 78a2c3a0b1..479782a290 100644 --- a/var/spack/repos/builtin/packages/libgeotiff/package.py +++ b/var/spack/repos/builtin/packages/libgeotiff/package.py @@ -29,7 +29,7 @@ class Libgeotiff(AutotoolsPackage): variant("jpeg", default=True, description="Include jpeg support") variant("proj", default=True, description="Use PROJ.x library") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("jpeg", when="+jpeg") depends_on("libtiff") depends_on("proj", when="+proj") @@ -60,7 +60,7 @@ class Libgeotiff(AutotoolsPackage): args = ["--with-libtiff={0}".format(spec["libtiff"].prefix)] if "+zlib" in spec: - args.append("--with-zlib={0}".format(spec["zlib"].prefix)) + args.append("--with-zlib={0}".format(spec["zlib-api"].prefix)) else: args.append("--with-zlib=no") diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index d0ec677c85..b575c51ed1 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -26,7 +26,7 @@ class Libharu(AutotoolsPackage): depends_on("autoconf", type=("build")) depends_on("automake", type=("build")) depends_on("libpng") - depends_on("zlib") + depends_on("zlib-api") def autoreconf(self, spec, prefix): """execute their autotools wrapper script""" @@ -39,7 +39,7 @@ class Libharu(AutotoolsPackage): spec = self.spec args = [] - args.append("--with-zlib={0}".format(spec["zlib"].prefix)) + args.append("--with-zlib={0}".format(spec["zlib-api"].prefix)) args.append("--with-png={0}".format(spec["libpng"].prefix)) return args diff --git a/var/spack/repos/builtin/packages/libid3tag/package.py b/var/spack/repos/builtin/packages/libid3tag/package.py index 8da31bd278..e62e143922 100644 --- a/var/spack/repos/builtin/packages/libid3tag/package.py +++ b/var/spack/repos/builtin/packages/libid3tag/package.py @@ -17,7 +17,7 @@ class Libid3tag(AutotoolsPackage): version("0.15.1b", sha256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151") - depends_on("zlib") + depends_on("zlib-api") depends_on("gperf") # source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/10_utf16.diff?h=packages/libid3tag diff --git a/var/spack/repos/builtin/packages/libkml/package.py b/var/spack/repos/builtin/packages/libkml/package.py index 19eadb883d..ab59d6d720 100644 --- a/var/spack/repos/builtin/packages/libkml/package.py +++ b/var/spack/repos/builtin/packages/libkml/package.py @@ -32,7 +32,8 @@ class Libkml(CMakePackage): depends_on("expat@2.1.0:") depends_on("minizip@1.2.8:") depends_on("uriparser") - depends_on("zlib@1.2.8:") + depends_on("zlib-api") + conflicts("^zlib@:1.2.7") depends_on("googletest@1.7.0:", type="link") depends_on("swig", when="+java", type="build") depends_on("swig", when="+python", type="build") diff --git a/var/spack/repos/builtin/packages/liblbxutil/package.py b/var/spack/repos/builtin/packages/liblbxutil/package.py index cad591781b..0be107cb18 100644 --- a/var/spack/repos/builtin/packages/liblbxutil/package.py +++ b/var/spack/repos/builtin/packages/liblbxutil/package.py @@ -18,7 +18,7 @@ class Liblbxutil(AutotoolsPackage, XorgPackage): depends_on("xproto") depends_on("pkgconfig", type="build") depends_on("util-macros", type="build") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") # There is a bug in the library that causes the following messages: # undefined symbol: Xfree diff --git a/var/spack/repos/builtin/packages/libmng/package.py b/var/spack/repos/builtin/packages/libmng/package.py index 28a9cde692..1b582b22f5 100644 --- a/var/spack/repos/builtin/packages/libmng/package.py +++ b/var/spack/repos/builtin/packages/libmng/package.py @@ -18,7 +18,7 @@ class Libmng(CMakePackage): version("2.0.2", sha256="4908797bb3541fb5cd8fffbe0b1513ed163509f2a4d57a78b26a96f8d1dd05a2") depends_on("jpeg") - depends_on("zlib") + depends_on("zlib-api") depends_on("lcms") def patch(self): diff --git a/var/spack/repos/builtin/packages/libmolgrid/package.py b/var/spack/repos/builtin/packages/libmolgrid/package.py index e647a3b97b..20932dac86 100644 --- a/var/spack/repos/builtin/packages/libmolgrid/package.py +++ b/var/spack/repos/builtin/packages/libmolgrid/package.py @@ -20,7 +20,7 @@ class Libmolgrid(CMakePackage): version("0.5.3", sha256="a9f7a62cdeb516bc62a06b324cdd33b095a787df175c6166d74a8d30b6916abb") version("0.5.2", sha256="e732d13a96c2f374d57a73999119bef700172d392c195c751214aa6ac6680c3a") - depends_on("zlib") + depends_on("zlib-api") depends_on("boost +regex +test +program_options +system +filesystem +iostreams +python") depends_on("openbabel@3:~gui~cairo") depends_on("cuda@11") diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index befa55f567..27a0fc9bd5 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -28,7 +28,7 @@ class Libpng(CMakePackage): version("1.5.30", sha256="7d76275fad2ede4b7d87c5fd46e6f488d2a16b5a69dc968ffa840ab39ba756ed") version("1.2.57", sha256="0f4620e11fa283fedafb474427c8e96bf149511a1804bdc47350963ae5cf54d8") - depends_on("zlib@1.0.4:") # 1.2.5 or later recommended + depends_on("zlib-api") variant( "libs", @@ -42,8 +42,8 @@ class Libpng(CMakePackage): class CMakeBuilder(CMakeBuilder): def cmake_args(self): args = [ - self.define("CMAKE_CXX_FLAGS", self.spec["zlib"].headers.include_flags), - self.define("ZLIB_ROOT", self.spec["zlib"].prefix), + self.define("CMAKE_CXX_FLAGS", self.spec["zlib-api"].headers.include_flags), + self.define("ZLIB_ROOT", self.spec["zlib-api"].prefix), self.define("PNG_SHARED", "shared" in self.spec.variants["libs"].value), self.define("PNG_STATIC", "static" in self.spec.variants["libs"].value), ] diff --git a/var/spack/repos/builtin/packages/libproxy/package.py b/var/spack/repos/builtin/packages/libproxy/package.py index 5d39456752..65915bb1f5 100644 --- a/var/spack/repos/builtin/packages/libproxy/package.py +++ b/var/spack/repos/builtin/packages/libproxy/package.py @@ -22,7 +22,7 @@ class Libproxy(CMakePackage): variant("perl", default=False, description="Enable Perl bindings") variant("python", default=False, description="Enable Python bindings", when="@0.4.16:") - depends_on("zlib") + depends_on("zlib-api") depends_on("perl", type=("build", "run"), when="+perl") extends("python@:3.8", when="+python") diff --git a/var/spack/repos/builtin/packages/libreproc/package.py b/var/spack/repos/builtin/packages/libreproc/package.py index d39eada315..3417e4dcf8 100644 --- a/var/spack/repos/builtin/packages/libreproc/package.py +++ b/var/spack/repos/builtin/packages/libreproc/package.py @@ -20,8 +20,7 @@ class Libreproc(CMakePackage): variant("shared", default=True, description="Build shared libraries") depends_on("cmake@3.14:", type="build") - depends_on("zlib+shared", type="link", when="+shared") - depends_on("zlib~shared", type="link", when="~shared") + depends_on("zlib-api", type="link") def cmake_args(self): return [ diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py index 444a74b3bf..94f28aa318 100644 --- a/var/spack/repos/builtin/packages/librom/package.py +++ b/var/spack/repos/builtin/packages/librom/package.py @@ -17,7 +17,7 @@ class Librom(AutotoolsPackage): depends_on("lapack") depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") depends_on("libszip") depends_on("hdf5") depends_on("perl") @@ -34,7 +34,7 @@ class Librom(AutotoolsPackage): args = [ "--with-lapack={0}".format(spec["lapack"].prefix), "--with-lapack-libs={0}".format(spec["lapack"].libs.ld_flags), - "--with-zlib={0}".format(spec["zlib"].prefix), + "--with-zlib={0}".format(spec["zlib-api"].prefix), "--with-szlib={0}".format(spec["libszip"].prefix), "--with-hdf5={0}".format(spec["hdf5"].prefix), "--with-MPICC={0}".format(spec["mpi"].mpicc), diff --git a/var/spack/repos/builtin/packages/librsb/package.py b/var/spack/repos/builtin/packages/librsb/package.py index bf42228fd0..2d5b9f0a16 100644 --- a/var/spack/repos/builtin/packages/librsb/package.py +++ b/var/spack/repos/builtin/packages/librsb/package.py @@ -21,7 +21,7 @@ class Librsb(AutotoolsPackage): version("1.2.0.9", sha256="f421f5d572461601120933e3c1cfee2ca69e6ecc92cbb11baa4e86bdedd3d9fa") version("1.2.0.8", sha256="8bebd19a1866d80ade13eabfdd0f07ae7e8a485c0b975b5d15f531ac204d80cb") - depends_on("zlib") + depends_on("zlib-api") depends_on("googletest", type="build", when="+googletest") conflicts("%apple-clang") # conflicts('%clang') @@ -46,8 +46,8 @@ class Librsb(AutotoolsPackage): "--enable-openmp", "--with-zlib", "--enable-fortran-module-install", - "CPPFLAGS={0}".format(self.spec["zlib"].headers.include_flags), - "LDFLAGS={0}".format(self.spec["zlib"].libs.search_flags), + "CPPFLAGS={0}".format(self.spec["zlib-api"].headers.include_flags), + "LDFLAGS={0}".format(self.spec["zlib-api"].libs.search_flags), ] if "+asan" in self.spec: args.append("CFLAGS=-O0 -ggdb -fsanitize=address -fno-omit-frame-pointer") diff --git a/var/spack/repos/builtin/packages/libsolv/package.py b/var/spack/repos/builtin/packages/libsolv/package.py index e3b5d61e03..f58e7463a1 100644 --- a/var/spack/repos/builtin/packages/libsolv/package.py +++ b/var/spack/repos/builtin/packages/libsolv/package.py @@ -20,8 +20,7 @@ class Libsolv(CMakePackage): variant("conda", default=False, description="Include solv/conda.h") depends_on("expat", type="link") - depends_on("zlib+shared", type="link", when="+shared") - depends_on("zlib~shared", type="link", when="~shared") + depends_on("zlib-api", type="link") def cmake_args(self): return [ diff --git a/var/spack/repos/builtin/packages/libssh/package.py b/var/spack/repos/builtin/packages/libssh/package.py index e5b1207db4..e239f3fb3c 100644 --- a/var/spack/repos/builtin/packages/libssh/package.py +++ b/var/spack/repos/builtin/packages/libssh/package.py @@ -19,7 +19,7 @@ class Libssh(CMakePackage): variant("gssapi", default=True, description="Build with gssapi support") depends_on("openssl@:1.0", when="@:0.7") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") depends_on("krb5", when="+gssapi") def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py index 512087a1c7..34b4127301 100644 --- a/var/spack/repos/builtin/packages/libssh2/package.py +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -41,7 +41,7 @@ class Libssh2(AutotoolsPackage, CMakePackage): depends_on("openssl@:1", when="@:1.9") depends_on("mbedtls@:2 +pic", when="crypto=mbedtls") - depends_on("zlib") + depends_on("zlib-api") depends_on("xz") # libssh2 adds its own deps in the pc file even when doing shared linking, diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 58bfaecc1b..3a686c70de 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -85,8 +85,8 @@ class Libtiff(CMakePackage, AutotoolsPackage): depends_on("cmake@2.8.9:", when="@4.0.6:4.0.9", type="build") depends_on("cmake@3:", when="@4.0.5", type="build") - depends_on("zlib", when="+zlib") - depends_on("zlib", when="+pixarlog") + depends_on("zlib-api", when="+zlib") + depends_on("zlib-api", when="+pixarlog") depends_on("jpeg@5:", when="+jpeg") depends_on("jbigkit", when="+jbig") depends_on("lerc", when="+lerc") diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index 39f806486b..b9115455a2 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -85,7 +85,7 @@ class Libunwind(AutotoolsPackage): depends_on("m4", type="build", when=reconf_versions) depends_on("xz", type="link", when="+xz") - depends_on("zlib", type="link", when="+zlib") + depends_on("zlib-api", type="link", when="+zlib") conflicts("platform=darwin", msg="Non-GNU libunwind needs ELF libraries Darwin does not have") diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py index 0682830455..db15138ff6 100644 --- a/var/spack/repos/builtin/packages/libwebsockets/package.py +++ b/var/spack/repos/builtin/packages/libwebsockets/package.py @@ -19,5 +19,5 @@ class Libwebsockets(CMakePackage): version("2.0.3", sha256="cf0e91b564c879ab98844385c98e7c9e298cbb969dbc251a3f18a47feb94342c") version("1.7.9", sha256="86a5105881ea2cb206f8795483d294e9509055decf60436bcc1e746262416438") - depends_on("zlib") + depends_on("zlib-api") depends_on("openssl") diff --git a/var/spack/repos/builtin/packages/libwmf/package.py b/var/spack/repos/builtin/packages/libwmf/package.py index 1bd0751708..040bf9dc95 100644 --- a/var/spack/repos/builtin/packages/libwmf/package.py +++ b/var/spack/repos/builtin/packages/libwmf/package.py @@ -28,7 +28,7 @@ class Libwmf(AutotoolsPackage): depends_on("libxml2") depends_on("libpng") depends_on("libjpeg") - depends_on("zlib") + depends_on("zlib-api") def configure_args(self): args = ["--disable-static"] diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 9c1f22adb8..0ddbb365c3 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -43,7 +43,7 @@ class Libxml2(AutotoolsPackage, NMakePackage): # conditional on non Windows, but rather than specify for each platform # specify for non Windows builder, which has equivalent effect depends_on("iconv", when="build_system=autotools") - depends_on("zlib") + depends_on("zlib-api") depends_on("xz") # avoid cycle dependency for concretizer @@ -235,8 +235,9 @@ class NMakeBuilder(nmake.NMakeBuilder, RunAfter): "iconv=no", "zlib=yes", "lzma=yes", - "lib=%s" % ";".join((spec["zlib"].prefix.lib, spec["xz"].prefix.lib)), - "include=%s" % ";".join((spec["zlib"].prefix.include, spec["xz"].prefix.include)), + "lib=%s" % ";".join((spec["zlib-api"].prefix.lib, spec["xz"].prefix.lib)), + "include=%s" + % ";".join((spec["zlib-api"].prefix.include, spec["xz"].prefix.include)), ] if "+python" in spec: opts.append("python=yes") diff --git a/var/spack/repos/builtin/packages/libxslt/package.py b/var/spack/repos/builtin/packages/libxslt/package.py index ed59366a80..0680d47dea 100644 --- a/var/spack/repos/builtin/packages/libxslt/package.py +++ b/var/spack/repos/builtin/packages/libxslt/package.py @@ -30,7 +30,7 @@ class Libxslt(AutotoolsPackage): depends_on("libxml2") depends_on("libxml2+python", when="+python") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("libgcrypt", when="+crypto") depends_on("python+shared", when="+python") diff --git a/var/spack/repos/builtin/packages/libzip/package.py b/var/spack/repos/builtin/packages/libzip/package.py index 93bbdce5ea..f475541864 100644 --- a/var/spack/repos/builtin/packages/libzip/package.py +++ b/var/spack/repos/builtin/packages/libzip/package.py @@ -16,7 +16,7 @@ class Libzip(AutotoolsPackage): version("1.3.2", sha256="ab4c34eb6c3a08b678cd0f2450a6c57a13e9618b1ba34ee45d00eb5327316457") version("1.2.0", sha256="6cf9840e427db96ebf3936665430bab204c9ebbd0120c326459077ed9c907d9f") - depends_on("zlib@1.1.2:") + depends_on("zlib-api") @property def headers(self): diff --git a/var/spack/repos/builtin/packages/liggghts/package.py b/var/spack/repos/builtin/packages/liggghts/package.py index 8fe4b74852..d9487bea45 100644 --- a/var/spack/repos/builtin/packages/liggghts/package.py +++ b/var/spack/repos/builtin/packages/liggghts/package.py @@ -27,7 +27,7 @@ class Liggghts(MakefilePackage): depends_on("vtk@6.1.0:8.2.0") depends_on("mpi", when="+mpi") depends_on("jpeg", when="+jpeg") - depends_on("zlib", when="+gzip") + depends_on("zlib-api", when="+gzip") build_directory = "src" build_targets = ["auto"] diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index fef8e1f708..ea380a5031 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -138,7 +138,7 @@ class LlvmAmdgpu(CMakePackage): depends_on("cmake@3.13.4:", type="build", when="@3.9.0:") depends_on("python", type="build") depends_on("z3", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("ncurses+termlib", type="link") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index f4c9f6ea51..37c3bbca0e 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -281,7 +281,7 @@ class Llvm(CMakePackage, CudaPackage): depends_on("libffi", when="+libomptarget") # libomptarget # llvm-config --system-libs libraries. - depends_on("zlib") + depends_on("zlib-api") # needs zstd cmake config file, which is not added when built with makefile. depends_on("zstd build_system=cmake", when="+zstd") diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index 1ed4160489..ff2991fa5c 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -24,7 +24,7 @@ class Log4cxx(CMakePackage): depends_on("apr-util") depends_on("apr") depends_on("boost+thread+system", when="cxxstd=11") - depends_on("zlib") + depends_on("zlib-api") depends_on("zip") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/lordec/package.py b/var/spack/repos/builtin/packages/lordec/package.py index 901942e5f2..f441c2859f 100644 --- a/var/spack/repos/builtin/packages/lordec/package.py +++ b/var/spack/repos/builtin/packages/lordec/package.py @@ -30,7 +30,7 @@ class Lordec(MakefilePackage): # See https://github.com/spack/spack/pull/22303 for reference depends_on(Boost.with_default_variants) depends_on("gatb-core@1.4.1:", type=["build", "link", "run"]) - depends_on("zlib", type=["build", "link"]) + depends_on("zlib-api", type=["build", "link"]) build_targets = ["clean", "all"] diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py index adcb6b99cb..88b66f4fc3 100644 --- a/var/spack/repos/builtin/packages/lrzip/package.py +++ b/var/spack/repos/builtin/packages/lrzip/package.py @@ -27,7 +27,7 @@ class Lrzip(Package): # depends_on('coreutils') depends_on("lzo") - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/madx/package.py b/var/spack/repos/builtin/packages/madx/package.py index 8534db82cc..4a11980ce2 100644 --- a/var/spack/repos/builtin/packages/madx/package.py +++ b/var/spack/repos/builtin/packages/madx/package.py @@ -34,7 +34,7 @@ class Madx(CMakePackage): depends_on("cmake@2.8:", type="build") depends_on("libx11") - depends_on("zlib") + depends_on("zlib-api") def cmake_args(self): args = [ diff --git a/var/spack/repos/builtin/packages/maeparser/package.py b/var/spack/repos/builtin/packages/maeparser/package.py index 9ca021e334..97f141608f 100644 --- a/var/spack/repos/builtin/packages/maeparser/package.py +++ b/var/spack/repos/builtin/packages/maeparser/package.py @@ -24,7 +24,7 @@ class Maeparser(CMakePackage): ) depends_on("boost +iostreams +filesystem +test") - depends_on("zlib") + depends_on("zlib-api") def cmake_args(self): args = [self.define_from_variant("MAEPARSER_BUILD_SHARED_LIBS", "shared")] diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 8d757bd985..49bf9ab2bc 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -75,7 +75,7 @@ class Magics(CMakePackage): # that files that make calls to png library get compiled and linked # unconditionally, which makes png a non-optional dependency (and # ENABLE_PNG always has to be set to ON). - depends_on("zlib") + depends_on("zlib-api") depends_on("libpng") # GRIB support is non-optional, regardless of what the instruction says. diff --git a/var/spack/repos/builtin/packages/mapnik/package.py b/var/spack/repos/builtin/packages/mapnik/package.py index e1a3f1487b..e49463d334 100644 --- a/var/spack/repos/builtin/packages/mapnik/package.py +++ b/var/spack/repos/builtin/packages/mapnik/package.py @@ -32,7 +32,7 @@ class Mapnik(AutotoolsPackage): # See https://github.com/spack/spack/pull/22303 for reference depends_on(Boost.with_default_variants) depends_on("icu4c") - depends_on("zlib") + depends_on("zlib-api") depends_on("freetype") depends_on("libxml2") depends_on("harfbuzz") diff --git a/var/spack/repos/builtin/packages/mapserver/package.py b/var/spack/repos/builtin/packages/mapserver/package.py index 15bdbdcaba..f4f82b7cc2 100644 --- a/var/spack/repos/builtin/packages/mapserver/package.py +++ b/var/spack/repos/builtin/packages/mapserver/package.py @@ -33,7 +33,7 @@ class Mapserver(CMakePackage): depends_on("libpng") depends_on("freetype") depends_on("jpeg") - depends_on("zlib") + depends_on("zlib-api") depends_on("proj") depends_on("proj@:5", when="@:7.3") depends_on("proj@6:", when="@7.4:") diff --git a/var/spack/repos/builtin/packages/mariadb-c-client/package.py b/var/spack/repos/builtin/packages/mariadb-c-client/package.py index 740981c9a5..047c30b5aa 100644 --- a/var/spack/repos/builtin/packages/mariadb-c-client/package.py +++ b/var/spack/repos/builtin/packages/mariadb-c-client/package.py @@ -63,7 +63,7 @@ class MariadbCClient(CMakePackage): depends_on("curl") depends_on("pcre") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") depends_on("krb5") # patch needed for cmake-3.20 diff --git a/var/spack/repos/builtin/packages/mariadb/package.py b/var/spack/repos/builtin/packages/mariadb/package.py index 3378041599..3acca3dbbf 100644 --- a/var/spack/repos/builtin/packages/mariadb/package.py +++ b/var/spack/repos/builtin/packages/mariadb/package.py @@ -52,7 +52,7 @@ class Mariadb(CMakePackage): depends_on("libedit") depends_on("libevent", when="+nonblocking") depends_on("ncurses") - depends_on("zlib") + depends_on("zlib-api") depends_on("curl") depends_on("libxml2") depends_on("lz4") diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index c3ee433c97..24f42ebe48 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -24,7 +24,7 @@ class Masurca(Package): depends_on("perl", type=("build", "run")) depends_on(Boost.with_default_variants) - depends_on("zlib") + depends_on("zlib-api") patch("arm.patch", when="target=aarch64:") def patch(self): diff --git a/var/spack/repos/builtin/packages/matio/package.py b/var/spack/repos/builtin/packages/matio/package.py index 2451189ac9..9f3d237398 100644 --- a/var/spack/repos/builtin/packages/matio/package.py +++ b/var/spack/repos/builtin/packages/matio/package.py @@ -34,13 +34,13 @@ class Matio(AutotoolsPackage): variant("hdf5", default=True, description="support for version 7.3 mat files via hdf5") variant("shared", default=True, description="Enables the build of shared libraries.") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("hdf5", when="+hdf5") def configure_args(self): args = [] if "+zlib" in self.spec: - args.append("--with-zlib=%s" % self.spec["zlib"].prefix) + args.append("--with-zlib=%s" % self.spec["zlib-api"].prefix) if "+hdf5" in self.spec: args.append("--with-hdf5=%s" % self.spec["hdf5"].prefix) if "+shared" not in self.spec: diff --git a/var/spack/repos/builtin/packages/megahit/package.py b/var/spack/repos/builtin/packages/megahit/package.py index cfc2ad269d..cb96687d78 100644 --- a/var/spack/repos/builtin/packages/megahit/package.py +++ b/var/spack/repos/builtin/packages/megahit/package.py @@ -16,7 +16,7 @@ class Megahit(MakefilePackage): version("1.1.4", sha256="ecd64c8bfa516ef6b19f9b2961ede281ec814db836f1a91953c213c944e1575f") version("1.1.3", sha256="b6eefdee075aaf7a8f9090e2e8b08b770caff90aa43a255e0e220d82ce71c492") - depends_on("zlib") + depends_on("zlib-api") patch("amd.patch", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py index 1229847ee6..c73a0a43b8 100644 --- a/var/spack/repos/builtin/packages/meme/package.py +++ b/var/spack/repos/builtin/packages/meme/package.py @@ -24,7 +24,7 @@ class Meme(AutotoolsPackage): variant("mpi", default=True, description="Enable MPI support") variant("image-magick", default=False, description="Enable image-magick for png output") - depends_on("zlib", type=("link")) + depends_on("zlib-api", type=("link")) depends_on("libgcrypt", type=("link")) depends_on("perl", type=("build", "run")) depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 27a0bd29c0..560fd10dac 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -56,7 +56,7 @@ class Mesa(MesonPackage): depends_on("py-mako@0.8.0:", type="build") depends_on("unwind") depends_on("expat") - depends_on("zlib@1.2.3:") + depends_on("zlib-api") # Internal options variant("llvm", default=True, description="Enable LLVM.") diff --git a/var/spack/repos/builtin/packages/mesa18/package.py b/var/spack/repos/builtin/packages/mesa18/package.py index 663b1138a5..80692045ba 100644 --- a/var/spack/repos/builtin/packages/mesa18/package.py +++ b/var/spack/repos/builtin/packages/mesa18/package.py @@ -36,7 +36,7 @@ class Mesa18(AutotoolsPackage): depends_on("python@:3.8", type="build") # https://github.com/spack/spack/issues/28219 depends_on("py-mako@0.8.0:", type="build") depends_on("libxml2") - depends_on("zlib") + depends_on("zlib-api") depends_on("expat") depends_on("ncurses+termlib") diff --git a/var/spack/repos/builtin/packages/met/package.py b/var/spack/repos/builtin/packages/met/package.py index 111e6e2e85..66343a09f9 100644 --- a/var/spack/repos/builtin/packages/met/package.py +++ b/var/spack/repos/builtin/packages/met/package.py @@ -38,7 +38,7 @@ class Met(AutotoolsPackage): depends_on("gsl") depends_on("bufr") - depends_on("zlib") + depends_on("zlib-api") depends_on("netcdf-c") depends_on("netcdf-cxx4") depends_on("g2c", when="+grib2") diff --git a/var/spack/repos/builtin/packages/metabat/package.py b/var/spack/repos/builtin/packages/metabat/package.py index 08846c1077..c623bd87bf 100644 --- a/var/spack/repos/builtin/packages/metabat/package.py +++ b/var/spack/repos/builtin/packages/metabat/package.py @@ -37,7 +37,7 @@ class Metabat(CMakePackage): # See https://github.com/spack/spack/pull/22303 for reference depends_on(Boost.with_default_variants, type=("build", "run")) depends_on("perl", type="run") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("ncurses", type="link") def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index b3b8daad4b..d0f665cc67 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -334,7 +334,7 @@ class Mfem(Package, CudaPackage, ROCmPackage): depends_on("mpfr", when="+mpfr") depends_on("netcdf-c@4.1.3:", when="+netcdf") depends_on("unwind", when="+libunwind") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("gnutls", when="+gnutls") depends_on("conduit@0.3.1:,master:", when="+conduit") depends_on("conduit+mpi", when="+conduit+mpi") @@ -852,11 +852,11 @@ class Mfem(Package, CudaPackage, ROCmPackage): if "+zlib" in spec: if "@:3.3.2" in spec: - options += ["ZLIB_DIR=%s" % spec["zlib"].prefix] + options += ["ZLIB_DIR=%s" % spec["zlib-api"].prefix] else: options += [ - "ZLIB_OPT=-I%s" % spec["zlib"].prefix.include, - "ZLIB_LIB=%s" % ld_flags_from_library_list(spec["zlib"].libs), + "ZLIB_OPT=-I%s" % spec["zlib-api"].prefix.include, + "ZLIB_LIB=%s" % ld_flags_from_library_list(spec["zlib-api"].libs), ] if "+mpfr" in spec: diff --git a/var/spack/repos/builtin/packages/mgard/package.py b/var/spack/repos/builtin/packages/mgard/package.py index 0064fda35a..ca9f2f46e4 100644 --- a/var/spack/repos/builtin/packages/mgard/package.py +++ b/var/spack/repos/builtin/packages/mgard/package.py @@ -43,7 +43,7 @@ class Mgard(CMakePackage, CudaPackage): depends_on("python", type=("build",), when="@2022-11-18:") depends_on("sed", type=("build",), when="@2022-11-18:") - depends_on("zlib") + depends_on("zlib-api") depends_on("pkgconfig", type=("build",), when="@2022-11-18:") depends_on("zstd") depends_on("protobuf@:3.21.12", when="@2022-11-18:") diff --git a/var/spack/repos/builtin/packages/micromamba/package.py b/var/spack/repos/builtin/packages/micromamba/package.py index 71af405940..7b8f2a0645 100644 --- a/var/spack/repos/builtin/packages/micromamba/package.py +++ b/var/spack/repos/builtin/packages/micromamba/package.py @@ -110,7 +110,7 @@ class Micromamba(CMakePackage): depends_on("bzip2", type="link") depends_on("lz4", type="link") depends_on("zstd", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("xz libs=static", type="link") depends_on("lzo", type="link") depends_on("libsolv+conda~shared", type="link") diff --git a/var/spack/repos/builtin/packages/migrate/package.py b/var/spack/repos/builtin/packages/migrate/package.py index 5db76564f2..d4aa59698e 100644 --- a/var/spack/repos/builtin/packages/migrate/package.py +++ b/var/spack/repos/builtin/packages/migrate/package.py @@ -22,7 +22,7 @@ class Migrate(AutotoolsPackage): depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("openmpi", type=("build", "link", "run"), when="+mpi") diff --git a/var/spack/repos/builtin/packages/millepede/package.py b/var/spack/repos/builtin/packages/millepede/package.py index bec7e307aa..6cc9b5a9ad 100644 --- a/var/spack/repos/builtin/packages/millepede/package.py +++ b/var/spack/repos/builtin/packages/millepede/package.py @@ -21,7 +21,7 @@ class Millepede(MakefilePackage): version("04-13-03", sha256="669a6e46a6f02ba3c78b2760e2ffb2c90d25b582ccd1a5c0770eef81c7bcbbe9") version("04-11-01", sha256="9869eb84d8d07cecfab15c396f3faa36aef10906e39f8641c48b58e0325b3205") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): make("install", "PREFIX=" + prefix) diff --git a/var/spack/repos/builtin/packages/minc-toolkit/package.py b/var/spack/repos/builtin/packages/minc-toolkit/package.py index 43c88269b2..40e793d24d 100644 --- a/var/spack/repos/builtin/packages/minc-toolkit/package.py +++ b/var/spack/repos/builtin/packages/minc-toolkit/package.py @@ -29,7 +29,7 @@ class MincToolkit(CMakePackage): depends_on("perl-mni-perllib", type=("build", "run")) depends_on("flex", type=("build", "run")) # e.g minccalc depends on libfl.so depends_on("bison", type="build") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("freeglut", when="+visualisation") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py index d14ce5cd2a..4329cee490 100644 --- a/var/spack/repos/builtin/packages/mindthegap/package.py +++ b/var/spack/repos/builtin/packages/mindthegap/package.py @@ -22,4 +22,4 @@ class Mindthegap(CMakePackage): depends_on("cmake@3.1:", type="build", when="@2.3.0") depends_on("cmake@2.6:", type="build", when="@2.0.2") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/miniasm/package.py b/var/spack/repos/builtin/packages/miniasm/package.py index 0518dceb0f..4cddf247e1 100644 --- a/var/spack/repos/builtin/packages/miniasm/package.py +++ b/var/spack/repos/builtin/packages/miniasm/package.py @@ -15,7 +15,7 @@ class Miniasm(MakefilePackage): version("2018-3-30", commit="55cf0189e2f7d5bda5868396cebe066eec0a9547") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): install_tree(".", prefix.bin) diff --git a/var/spack/repos/builtin/packages/minimap2/package.py b/var/spack/repos/builtin/packages/minimap2/package.py index b7f7dc1197..e84bb54044 100644 --- a/var/spack/repos/builtin/packages/minimap2/package.py +++ b/var/spack/repos/builtin/packages/minimap2/package.py @@ -20,7 +20,7 @@ class Minimap2(PythonPackage): version("2.2", sha256="7e8683aa74c4454a8cfe3821f405c4439082e24c152b4b834fdb56a117ecaed9") conflicts("target=aarch64:", when="@:2.10") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("py-setuptools", type="build") depends_on("py-cython", type="build") diff --git a/var/spack/repos/builtin/packages/minizip/package.py b/var/spack/repos/builtin/packages/minizip/package.py index 580cadfe65..25242a60d9 100644 --- a/var/spack/repos/builtin/packages/minizip/package.py +++ b/var/spack/repos/builtin/packages/minizip/package.py @@ -20,7 +20,7 @@ class Minizip(AutotoolsPackage): depends_on("autoconf", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") - depends_on("zlib") + depends_on("zlib-api") # error: implicit declaration of function 'mkdir' is invalid in C99 patch("implicit.patch", when="%apple-clang@12:") diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 5af9aa2b68..cba5bb87d3 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -113,7 +113,7 @@ class MiopenHip(CMakePackage): depends_on("bzip2") depends_on("sqlite") depends_on("half") - depends_on("zlib", when="@3.9.0:") + depends_on("zlib-api", when="@3.9.0:") patch("0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch", when="@3.9.0:5.0.2") patch("miopen-hip-include-nlohmann-include-directory.patch", when="@5.4.0:") @@ -159,7 +159,7 @@ class MiopenHip(CMakePackage): def setup_build_environment(self, env): if "@3.9.0:" in self.spec: - lib_dir = self.spec["zlib"].libs.directories[0] + lib_dir = self.spec["zlib-api"].libs.directories[0] env.prepend_path("LIBRARY_PATH", lib_dir) def get_bitcode_dir(self): diff --git a/var/spack/repos/builtin/packages/mlirmiopen/package.py b/var/spack/repos/builtin/packages/mlirmiopen/package.py index 312341e4a6..4515385b4a 100644 --- a/var/spack/repos/builtin/packages/mlirmiopen/package.py +++ b/var/spack/repos/builtin/packages/mlirmiopen/package.py @@ -44,7 +44,7 @@ class Mlirmiopen(CMakePackage): depends_on("python", type="build") depends_on("z3", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("ncurses+termlib", type="link") depends_on("bzip2") depends_on("sqlite") diff --git a/var/spack/repos/builtin/packages/mold/package.py b/var/spack/repos/builtin/packages/mold/package.py index f964162427..06b4aa2962 100644 --- a/var/spack/repos/builtin/packages/mold/package.py +++ b/var/spack/repos/builtin/packages/mold/package.py @@ -18,9 +18,9 @@ class Mold(CMakePackage): version("1.7.1", sha256="fa2558664db79a1e20f09162578632fa856b3cde966fbcb23084c352b827dfa9") depends_on("mimalloc") + depends_on("zlib-api") depends_on("openssl") depends_on("tbb") - depends_on("zlib") def cmake_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/mongo-c-driver/package.py b/var/spack/repos/builtin/packages/mongo-c-driver/package.py index 5794ec0ccf..d36854c931 100644 --- a/var/spack/repos/builtin/packages/mongo-c-driver/package.py +++ b/var/spack/repos/builtin/packages/mongo-c-driver/package.py @@ -63,7 +63,7 @@ class MongoCDriver(Package): depends_on("openssl", when="+ssl") depends_on("snappy", when="+snappy") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("zstd", when="+zstd") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/mosesdecoder/package.py b/var/spack/repos/builtin/packages/mosesdecoder/package.py index b26fb81622..60112a6327 100644 --- a/var/spack/repos/builtin/packages/mosesdecoder/package.py +++ b/var/spack/repos/builtin/packages/mosesdecoder/package.py @@ -22,5 +22,5 @@ class Mosesdecoder(Package): depends_on("tcl") depends_on("gcc") depends_on("boost") - depends_on("zlib") + depends_on("zlib-api") depends_on("python") diff --git a/var/spack/repos/builtin/packages/mosh/package.py b/var/spack/repos/builtin/packages/mosh/package.py index 705d390959..bea6f2a08f 100644 --- a/var/spack/repos/builtin/packages/mosh/package.py +++ b/var/spack/repos/builtin/packages/mosh/package.py @@ -23,7 +23,7 @@ class Mosh(AutotoolsPackage): depends_on("protobuf") depends_on("ncurses") - depends_on("zlib") + depends_on("zlib-api") depends_on("openssl") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/mothur/package.py b/var/spack/repos/builtin/packages/mothur/package.py index 9263be74e8..fe36e1cbd1 100644 --- a/var/spack/repos/builtin/packages/mothur/package.py +++ b/var/spack/repos/builtin/packages/mothur/package.py @@ -38,7 +38,7 @@ class Mothur(MakefilePackage): depends_on("readline") depends_on("vsearch@2.13.5:", type="run") depends_on("usearch", type="run") - depends_on("zlib", when="+boost") + depends_on("zlib-api", when="+boost") def edit(self, spec, prefix): filter_file(r"^.*DMOTHUR_TOOLS.*$", "", "Makefile") diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py index 1cb3ae3d03..2a59d7ec22 100644 --- a/var/spack/repos/builtin/packages/mrtrix3/package.py +++ b/var/spack/repos/builtin/packages/mrtrix3/package.py @@ -28,7 +28,7 @@ class Mrtrix3(Package): depends_on("glu") depends_on("qt+opengl@4.7:") depends_on("eigen") - depends_on("zlib") + depends_on("zlib-api") depends_on("libtiff") depends_on("fftw") diff --git a/var/spack/repos/builtin/packages/muse/package.py b/var/spack/repos/builtin/packages/muse/package.py index 12d7cbe350..685e020a65 100644 --- a/var/spack/repos/builtin/packages/muse/package.py +++ b/var/spack/repos/builtin/packages/muse/package.py @@ -14,7 +14,7 @@ class Muse(MakefilePackage): version("1.0-rc", sha256="b48b8be0044a2249bdc0b625fe0192c65089c598bbd1b1142902dfa81e804023") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") def install(self, spec, prefix): mkdir(prefix.bin) diff --git a/var/spack/repos/builtin/packages/mvapich/package.py b/var/spack/repos/builtin/packages/mvapich/package.py index 1022639a1a..68df26215a 100644 --- a/var/spack/repos/builtin/packages/mvapich/package.py +++ b/var/spack/repos/builtin/packages/mvapich/package.py @@ -100,7 +100,7 @@ class Mvapich(AutotoolsPackage): depends_on("findutils", type="build") depends_on("bison", type="build") depends_on("pkgconfig", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("libpciaccess", when=(sys.platform != "darwin")) depends_on("libxml2") depends_on("cuda", when="+cuda") diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 6b7181a88d..c1f67620f3 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -121,7 +121,7 @@ class Mvapich2(AutotoolsPackage): depends_on("findutils", type="build") depends_on("bison", type="build") depends_on("pkgconfig", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("libpciaccess", when=(sys.platform != "darwin")) depends_on("libxml2") depends_on("cuda", when="+cuda") diff --git a/var/spack/repos/builtin/packages/nauty/package.py b/var/spack/repos/builtin/packages/nauty/package.py index eec5b90bab..6c6e54efe3 100644 --- a/var/spack/repos/builtin/packages/nauty/package.py +++ b/var/spack/repos/builtin/packages/nauty/package.py @@ -75,7 +75,7 @@ class Nauty(AutotoolsPackage): depends_on("libtool", type="build", when="@2.6r7") depends_on("pkgconfig", type="build") depends_on("help2man", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("gmp") @property diff --git a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py index bb2db9813c..cadaf37711 100644 --- a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py +++ b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py @@ -52,7 +52,7 @@ class NcbiToolkit(AutotoolsPackage): depends_on("pcre") depends_on("giflib") depends_on("sqlite@3.6.6:") - depends_on("zlib") + depends_on("zlib-api") depends_on("samtools") depends_on("bamtools") depends_on("berkeley-db") diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index 0d0b8e4c8b..f111264e81 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -241,7 +241,8 @@ class NetcdfC(CMakePackage, AutotoolsPackage): # https://docs.unidata.ucar.edu/nug/current/getting_and_building_netcdf.html), zlib 1.2.5 or # later is required for netCDF-4 compression. However, zlib became a direct dependency only # starting NetCDF 4.9.0 (for the deflate plugin): - depends_on("zlib@1.2.5:", when="@4.9.0:+shared") + depends_on("zlib-api", when="@4.9.0:+shared") + depends_on("zlib@1.2.5:", when="^zlib") # Use the vendored bzip2 on Windows: for __p in ["darwin", "cray", "linux"]: @@ -433,7 +434,7 @@ class AutotoolsBuilder(BaseBuilder, autotools.AutotoolsBuilder): extra_libs.append(hdf["szip"].libs) if "+external-xdr" in hdf: extra_libs.append(hdf["rpc"].libs) - extra_libs.append(hdf["zlib"].libs) + extra_libs.append(hdf["zlib-api"].libs) hdf5 = self.spec["hdf5:hl"] lib_search_dirs.extend(hdf5.libs.directories) @@ -443,7 +444,7 @@ class AutotoolsBuilder(BaseBuilder, autotools.AutotoolsBuilder): extra_libs.append(hdf5["zlib"].libs) if self.spec.satisfies("@4.9.0:+shared"): - lib_search_dirs.extend(self.spec["zlib"].libs.directories) + lib_search_dirs.extend(self.spec["zlib-api"].libs.directories) else: # Prevent overlinking to zlib: config_args.append("ac_cv_search_deflate=") diff --git a/var/spack/repos/builtin/packages/netdata/package.py b/var/spack/repos/builtin/packages/netdata/package.py index a2ce76110c..8395b518dd 100644 --- a/var/spack/repos/builtin/packages/netdata/package.py +++ b/var/spack/repos/builtin/packages/netdata/package.py @@ -27,7 +27,7 @@ class Netdata(AutotoolsPackage): depends_on("openssl") depends_on("python@3:", type=("build", "run")) depends_on("uuid") - depends_on("zlib") + depends_on("zlib-api") def setup_run_environment(self, env): env.prepend_path("PATH", self.prefix.sbin) diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py index 421acb3e35..1c890ef079 100644 --- a/var/spack/repos/builtin/packages/netgen/package.py +++ b/var/spack/repos/builtin/packages/netgen/package.py @@ -24,7 +24,7 @@ class Netgen(AutotoolsPackage): variant("gui", default=False, description="enable gui") variant("metis", default=False, description="use metis for partitioning") - depends_on("zlib") + depends_on("zlib-api") depends_on("mpi", when="+mpi") depends_on("oce+X11", when="+oce") depends_on("metis", when="+metis") diff --git a/var/spack/repos/builtin/packages/netpbm/package.py b/var/spack/repos/builtin/packages/netpbm/package.py index 0e0cf67d9a..18b77e64d9 100644 --- a/var/spack/repos/builtin/packages/netpbm/package.py +++ b/var/spack/repos/builtin/packages/netpbm/package.py @@ -46,7 +46,7 @@ class Netpbm(MakefilePackage): # These are general pre-requisites indicated at # http://netpbm.sourceforge.net/prereq.html - depends_on("zlib") + depends_on("zlib-api") depends_on("jpeg") depends_on("libtiff") depends_on("libpng") @@ -147,7 +147,7 @@ class Netpbm(MakefilePackage): if not pkg_config("x11", "--exists"): config.append("X11LIB={0}".format(spec["libx11"].libs.ld_flags)) config.append("X11HDR_DIR={0}".format(spec["libx11"].headers.directories[0])) - config.append("ZLIB={0}".format(spec["zlib"].libs.ld_flags)) + config.append("ZLIB={0}".format(spec["zlib-api"].libs.ld_flags)) config.append("NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/") if spec.target.family == "x86_64": config.append("WANT_SSE = Y") diff --git a/var/spack/repos/builtin/packages/nginx/package.py b/var/spack/repos/builtin/packages/nginx/package.py index 169d02a04f..efc1cf0108 100644 --- a/var/spack/repos/builtin/packages/nginx/package.py +++ b/var/spack/repos/builtin/packages/nginx/package.py @@ -25,7 +25,7 @@ class Nginx(AutotoolsPackage): depends_on("openssl") depends_on("openssl@:1", when="@:1.21.2") depends_on("pcre") - depends_on("zlib") + depends_on("zlib-api") conflicts("%gcc@8:", when="@:1.14") diff --git a/var/spack/repos/builtin/packages/ngmerge/package.py b/var/spack/repos/builtin/packages/ngmerge/package.py index c8721d554e..7a3cc8f403 100644 --- a/var/spack/repos/builtin/packages/ngmerge/package.py +++ b/var/spack/repos/builtin/packages/ngmerge/package.py @@ -14,7 +14,7 @@ class Ngmerge(MakefilePackage): version("0.3", sha256="5928f727feebd0d1bcdbee0e631ba06fbe9ce88328bd58b6c8bf4e54cc742ac3") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/ngmlr/package.py b/var/spack/repos/builtin/packages/ngmlr/package.py index cc52f69bf9..278b7a0443 100644 --- a/var/spack/repos/builtin/packages/ngmlr/package.py +++ b/var/spack/repos/builtin/packages/ngmlr/package.py @@ -17,7 +17,7 @@ class Ngmlr(CMakePackage): version("0.2.7", sha256="5126a6b3e726cac0da0713883daac688f38587f118428247a9a3ace5a55b29aa") version("0.2.5", sha256="719944a35cc7ff9c321eedbf3385a7375ce2301f609b3fd7be0a850cabbb028b") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("sse2neon", when="target=aarch64:") patch("for_aarch64.patch", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/nmap/package.py b/var/spack/repos/builtin/packages/nmap/package.py index bd8f6b7f92..3eacd0343c 100644 --- a/var/spack/repos/builtin/packages/nmap/package.py +++ b/var/spack/repos/builtin/packages/nmap/package.py @@ -61,7 +61,7 @@ class Nmap(AutotoolsPackage): depends_on("libssh2@1.10") depends_on("pcre@8") - depends_on("zlib@1.2") + depends_on("zlib-api") def configure_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index dc9fb2684a..160913b33a 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -72,7 +72,7 @@ class NodeJs(Package): # depends_on('bash-completion', when="+bash-completion") depends_on("icu4c", when="+icu4c") depends_on("openssl@1.1:", when="+openssl") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") phases = ["configure", "build", "install"] @@ -137,8 +137,8 @@ class NodeJs(Package): args.extend( [ "--shared-zlib", - "--shared-zlib-includes={0}".format(self.spec["zlib"].prefix.include), - "--shared-zlib-libpath={0}".format(self.spec["zlib"].prefix.lib), + "--shared-zlib-includes={0}".format(self.spec["zlib-api"].prefix.include), + "--shared-zlib-libpath={0}".format(self.spec["zlib-api"].prefix.lib), ] ) diff --git a/var/spack/repos/builtin/packages/notmuch/package.py b/var/spack/repos/builtin/packages/notmuch/package.py index 0ba10baba4..506aaf8243 100644 --- a/var/spack/repos/builtin/packages/notmuch/package.py +++ b/var/spack/repos/builtin/packages/notmuch/package.py @@ -17,7 +17,7 @@ class Notmuch(AutotoolsPackage): version("0.23.7", sha256="f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913") - depends_on("zlib") + depends_on("zlib-api") depends_on("talloc") depends_on("gmime@2.6:") depends_on("xapian-core") diff --git a/var/spack/repos/builtin/packages/nss/package.py b/var/spack/repos/builtin/packages/nss/package.py index ffa4357773..43e156deb8 100644 --- a/var/spack/repos/builtin/packages/nss/package.py +++ b/var/spack/repos/builtin/packages/nss/package.py @@ -28,7 +28,7 @@ class Nss(MakefilePackage): depends_on("nspr@4.24:") depends_on("sqlite") - depends_on("zlib") + depends_on("zlib-api") parallel = False diff --git a/var/spack/repos/builtin/packages/octa/package.py b/var/spack/repos/builtin/packages/octa/package.py index 4df8138729..0f46bb1027 100644 --- a/var/spack/repos/builtin/packages/octa/package.py +++ b/var/spack/repos/builtin/packages/octa/package.py @@ -25,7 +25,7 @@ class Octa(AutotoolsPackage): depends_on("libtool", type="build") depends_on("libjpeg", type="link") depends_on("libpng", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("jogl") depends_on("python") depends_on("gnuplot", type="run") diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 4d9122b9d4..1098a0332d 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -109,7 +109,7 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): depends_on("qscintilla", when="+qscintilla") depends_on("qt+opengl", when="+qt") depends_on("suite-sparse", when="+suitesparse") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") def patch(self): # Filter mkoctfile.in.cc to use underlying compilers and not @@ -339,8 +339,8 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): if "+zlib" in spec: config_args.extend( [ - "--with-z-includedir=%s" % spec["zlib"].prefix.include, - "--with-z-libdir=%s" % spec["zlib"].prefix.lib, + "--with-z-includedir=%s" % spec["zlib-api"].prefix.include, + "--with-z-libdir=%s" % spec["zlib-api"].prefix.lib, ] ) else: diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 86c8993c06..67f4b01491 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -59,7 +59,7 @@ class OmegaH(CMakePackage, CudaPackage): depends_on("mpi", when="+mpi") depends_on("trilinos +kokkos", when="+trilinos") depends_on("kokkos", when="+kokkos") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") # Note: '+cuda' and 'cuda_arch' variants are added by the CudaPackage depends_on("cuda", when="+cuda") conflicts( @@ -126,7 +126,7 @@ class OmegaH(CMakePackage, CudaPackage): args.append("-DOmega_h_USE_Kokkos:BOOL=ON") if "+zlib" in self.spec: args.append("-DOmega_h_USE_ZLIB:BOOL=ON") - args.append("-DZLIB_ROOT:PATH={0}".format(self.spec["zlib"].prefix)) + args.append("-DZLIB_ROOT:PATH={0}".format(self.spec["zlib-api"].prefix)) else: args.append("-DOmega_h_USE_ZLIB:BOOL=OFF") if "+examples" in self.spec: diff --git a/var/spack/repos/builtin/packages/openbabel/package.py b/var/spack/repos/builtin/packages/openbabel/package.py index 37be524cc8..6bdb55f05d 100644 --- a/var/spack/repos/builtin/packages/openbabel/package.py +++ b/var/spack/repos/builtin/packages/openbabel/package.py @@ -44,7 +44,7 @@ class Openbabel(CMakePackage): depends_on("pango", when="+cairo") # custom cairo requires custom pango depends_on("eigen@3.0:") # required if using the language bindings depends_on("libxml2") # required to read/write CML files, XML formats - depends_on("zlib") # required to support reading gzipped files + depends_on("zlib-api") # required to support reading gzipped files depends_on("rapidjson") # required to support JSON depends_on("libsm") depends_on("uuid") diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py index 7d975f1dd1..69c90dc126 100644 --- a/var/spack/repos/builtin/packages/opencarp/package.py +++ b/var/spack/repos/builtin/packages/opencarp/package.py @@ -40,7 +40,7 @@ class Opencarp(CMakePackage): depends_on("gengetopt") depends_on("pkgconfig") depends_on("python") - depends_on("zlib") + depends_on("zlib-api") depends_on("perl") depends_on("py-carputils", when="+carputils", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index b07eed756b..3dd582aedc 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -727,7 +727,7 @@ class Opencv(CMakePackage, CudaPackage): depends_on("cmake@3.5.1:", type="build") depends_on("python@2.7:2.8,3.2:", type="build") depends_on("java", type="build") - depends_on("zlib@1.2.3:") + depends_on("zlib-api") # Optional 3rd party components (dependencies) depends_on("clp", when="+clp") @@ -937,7 +937,7 @@ class Opencv(CMakePackage, CudaPackage): args.append(self.define("ENABLE_VSX", True)) # Media I/O - zlib = spec["zlib"] + zlib = spec["zlib-api"] args.extend( [ self.define("BUILD_ZLIB", False), diff --git a/var/spack/repos/builtin/packages/openexr/package.py b/var/spack/repos/builtin/packages/openexr/package.py index 36c6ede944..14db2b9249 100644 --- a/var/spack/repos/builtin/packages/openexr/package.py +++ b/var/spack/repos/builtin/packages/openexr/package.py @@ -68,7 +68,7 @@ class Openexr(CMakePackage): depends_on("pkgconfig", when="@:2", type="build") depends_on("imath", when="@3:") depends_on("ilmbase", when="@:2") - depends_on("zlib") + depends_on("zlib-api") @property def build_directory(self): diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index 522a3a3a69..c497209d58 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -48,7 +48,7 @@ class Openfast(CMakePackage): depends_on("mpi", when="+cxx") depends_on("yaml-cpp", when="+cxx") depends_on("hdf5+mpi+cxx+hl", when="+cxx") - depends_on("zlib", when="+cxx") + depends_on("zlib-api", when="+cxx") depends_on("libxml2", when="+cxx") depends_on("netcdf-c", when="+cxx+netcdf") diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 524b8b5e02..d4dac86e74 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -96,7 +96,7 @@ class OpenfoamOrg(Package): ) depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") depends_on("flex") depends_on("cmake", type="build") diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index dcfade6b00..997aeee3f2 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -358,7 +358,7 @@ class Openfoam(Package): # but particular mixes of mpi versions and InfiniBand may not work so well # conflicts('^openmpi~thread_multiple', when='@1712:') - depends_on("zlib") + depends_on("zlib-api") depends_on("fftw-api") # TODO: replace this with an explicit list of components of Boost, diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index e2bbfe233c..d420cc274c 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -34,7 +34,7 @@ class Openjpeg(CMakePackage): variant("codec", default=False, description="Build the CODEC executables") - depends_on("zlib", when="+codec") + depends_on("zlib-api", when="+codec") depends_on("libpng", when="+codec") depends_on("libtiff", when="+codec") depends_on("lcms", when="+codec") diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 8922227048..edc67c16a4 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -523,7 +523,7 @@ class Openmpi(AutotoolsPackage, CudaPackage): depends_on("hwloc +cuda", when="+cuda ~internal-hwloc") depends_on("java", when="+java") depends_on("sqlite", when="+sqlite3") - depends_on("zlib", when="@3:") + depends_on("zlib-api", when="@3:") depends_on("valgrind~mpi", when="+memchecker") # Singularity release 3 works better depends_on("singularity@3:", when="+singularity") @@ -961,7 +961,7 @@ class Openmpi(AutotoolsPackage, CudaPackage): config_args.extend(["--enable-debug"]) # Package dependencies - for dep in ["libevent", "lustre", "singularity", "valgrind", "zlib"]: + for dep in ["libevent", "lustre", "singularity", "valgrind"]: if "^" + dep in spec: config_args.append("--with-{0}={1}".format(dep, spec[dep].prefix)) @@ -971,6 +971,9 @@ class Openmpi(AutotoolsPackage, CudaPackage): elif "^pmix" in spec: config_args.append("--with-pmix={0}".format(spec["pmix"].prefix)) + if "^zlib-api" in spec: + config_args.append("--with-zlib={0}".format(spec["zlib-api"].prefix)) + # Hwloc support if spec.satisfies("+internal-hwloc"): config_args.append("--with-hwloc=internal") diff --git a/var/spack/repos/builtin/packages/openpbs/package.py b/var/spack/repos/builtin/packages/openpbs/package.py index 305723569d..7bc9e45ad0 100644 --- a/var/spack/repos/builtin/packages/openpbs/package.py +++ b/var/spack/repos/builtin/packages/openpbs/package.py @@ -45,7 +45,7 @@ class Openpbs(AutotoolsPackage): depends_on("swig") depends_on("tcl") depends_on("tk") - depends_on("zlib") + depends_on("zlib-api") # The configure script cannot properly handle dependencies in non-system # directories. @@ -84,7 +84,7 @@ class Openpbs(AutotoolsPackage): # The argument --with-tk is introduced with with_lib.patch "--with-tk=%s" % self.spec["tk"].prefix, "--with-xauth=xauth", - "--with-libz=%s" % self.spec["zlib"].prefix, + "--with-libz=%s" % self.spec["zlib-api"].prefix, ] @run_after("install") diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index 273c91fa2b..bb4e2186a1 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -39,7 +39,7 @@ class Openscenegraph(CMakePackage): depends_on("jasper") depends_on("libtiff") depends_on("glib") - depends_on("zlib") + depends_on("zlib-api") depends_on("fontconfig") depends_on("ffmpeg+avresample", when="+ffmpeg") diff --git a/var/spack/repos/builtin/packages/openssh/package.py b/var/spack/repos/builtin/packages/openssh/package.py index 81fa452ed2..35680a9d52 100755 --- a/var/spack/repos/builtin/packages/openssh/package.py +++ b/var/spack/repos/builtin/packages/openssh/package.py @@ -57,7 +57,7 @@ class Openssh(AutotoolsPackage): depends_on("openssl") depends_on("libedit") depends_on("ncurses") - depends_on("zlib") + depends_on("zlib-api") depends_on("py-twisted", type="test") depends_on("libxcrypt", type="link") diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index a5e5a084bd..991c01fbc3 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -363,7 +363,7 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package with when("platform=windows"): variant("dynamic", default=False, description="Link with MSVC's dynamic runtime library") - depends_on("zlib") + depends_on("zlib-api") depends_on("perl@5.14.0:", type=("build", "test")) depends_on("ca-certificates-mozilla", type="build", when="certs=mozilla") depends_on("nasm", when="platform=windows") @@ -438,8 +438,8 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package else: base_args.extend( [ - "-I{0}".format(self.spec["zlib"].prefix.include), - "-L{0}".format(self.spec["zlib"].prefix.lib), + "-I{0}".format(self.spec["zlib-api"].prefix.include), + "-L{0}".format(self.spec["zlib-api"].prefix.lib), ] ) base_args.extend(options) diff --git a/var/spack/repos/builtin/packages/openvdb/package.py b/var/spack/repos/builtin/packages/openvdb/package.py index aabd5f5c5e..c382eebcfe 100644 --- a/var/spack/repos/builtin/packages/openvdb/package.py +++ b/var/spack/repos/builtin/packages/openvdb/package.py @@ -41,7 +41,7 @@ class Openvdb(CMakePackage): depends_on("openexr@2.3:3.1", when="@10:") depends_on("intel-tbb@:2020.1", when="@:8.1") depends_on("intel-tbb@2021", when="@8.2:") - depends_on("zlib") + depends_on("zlib-api") depends_on("c-blosc@1.17.0") # depends_on('c-blosc@1.5:') depends_on("py-numpy", when="+python") depends_on("boost+iostreams+system+python+numpy", when="+python") diff --git a/var/spack/repos/builtin/packages/ophidia-primitives/package.py b/var/spack/repos/builtin/packages/ophidia-primitives/package.py index a7728fbd13..fc9486e721 100644 --- a/var/spack/repos/builtin/packages/ophidia-primitives/package.py +++ b/var/spack/repos/builtin/packages/ophidia-primitives/package.py @@ -23,7 +23,7 @@ class OphidiaPrimitives(AutotoolsPackage): depends_on("boost@1.79.0") depends_on("mysql") depends_on("libmatheval") - depends_on("zlib") + depends_on("zlib-api") depends_on("gsl") def autoreconf(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/orc/package.py b/var/spack/repos/builtin/packages/orc/package.py index 194b13cf28..e07111440b 100644 --- a/var/spack/repos/builtin/packages/orc/package.py +++ b/var/spack/repos/builtin/packages/orc/package.py @@ -17,7 +17,8 @@ class Orc(CMakePackage): depends_on("maven") depends_on("openssl") - depends_on("zlib@1.2.11:") + depends_on("zlib-api") + depends_on("zlib@1.2.11:", when="^zlib") depends_on("pcre") depends_on("protobuf@3.5.1:") depends_on("zstd@1.4.5:") @@ -36,7 +37,9 @@ class Orc(CMakePackage): args.append("-DBUILD_TOOLS:BOOL=OFF") args.append("-DBUILD_CPP_TESTS:BOOL=OFF") - for x in ("snappy", "zlib", "zstd", "lz4", "protobuf"): + for x in ("snappy", "zstd", "lz4", "protobuf"): args.append("-D{0}_HOME={1}".format(x.upper(), self.spec[x].prefix)) + args.append(self.define("ZLIB_HOME", self.spec["zlib-api"].prefix)) + return args diff --git a/var/spack/repos/builtin/packages/orfm/package.py b/var/spack/repos/builtin/packages/orfm/package.py index 4e2a37de26..b2175c6ffe 100644 --- a/var/spack/repos/builtin/packages/orfm/package.py +++ b/var/spack/repos/builtin/packages/orfm/package.py @@ -17,4 +17,4 @@ class Orfm(AutotoolsPackage): version("0.7.1", sha256="19f39c72bcc48127b757613c5eef4abae95ee6c82dccf96b041db527b27f319a") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/osmctools/package.py b/var/spack/repos/builtin/packages/osmctools/package.py index f5097770b2..0a350a8f57 100644 --- a/var/spack/repos/builtin/packages/osmctools/package.py +++ b/var/spack/repos/builtin/packages/osmctools/package.py @@ -16,7 +16,7 @@ class Osmctools(AutotoolsPackage): version("0.9", sha256="2f5298be5b4ba840a04f360c163849b34a31386ccd287657885e21268665f413") version("0.8", sha256="54ae48717afd05707c9b1fd750dd56c33c3bae0755424ce8ca3795ee28e0ece8") - depends_on("zlib") + depends_on("zlib-api") depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/otf/package.py b/var/spack/repos/builtin/packages/otf/package.py index fd502ee10b..01ccec79ee 100644 --- a/var/spack/repos/builtin/packages/otf/package.py +++ b/var/spack/repos/builtin/packages/otf/package.py @@ -20,7 +20,7 @@ class Otf(AutotoolsPackage): "1.12.5salmon", sha256="0a8427360dedb38e8ddca30f14d95f826420c550337c5a79dbb754904e194088" ) - depends_on("zlib") + depends_on("zlib-api") def configure_args(self): args = [] @@ -30,6 +30,6 @@ class Otf(AutotoolsPackage): args.append("--without-zoidfs") args.append("--with-zlib") - args.append("--with-zlib-dir={0}".format(self.spec["zlib"].prefix)) + args.append("--with-zlib-dir={0}".format(self.spec["zlib-api"].prefix)) return args diff --git a/var/spack/repos/builtin/packages/p4est/package.py b/var/spack/repos/builtin/packages/p4est/package.py index 224bb61b7e..1068da372a 100644 --- a/var/spack/repos/builtin/packages/p4est/package.py +++ b/var/spack/repos/builtin/packages/p4est/package.py @@ -37,7 +37,7 @@ class P4est(AutotoolsPackage): # other dependencies depends_on("mpi", when="+mpi") - depends_on("zlib") + depends_on("zlib-api") # from sc upstream, correct the default libraries patch( diff --git a/var/spack/repos/builtin/packages/palace/package.py b/var/spack/repos/builtin/packages/palace/package.py index 51d7d4d588..fd06706db1 100644 --- a/var/spack/repos/builtin/packages/palace/package.py +++ b/var/spack/repos/builtin/packages/palace/package.py @@ -39,7 +39,7 @@ class Palace(CMakePackage): depends_on("cmake@3.13:", type="build") depends_on("pkgconfig", type="build") depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") depends_on("nlohmann-json") depends_on("fmt") depends_on("eigen") diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index 1594b5399d..edcdfaabc1 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -21,7 +21,7 @@ class Pandaseq(AutotoolsPackage): depends_on("automake", type="build") depends_on("libtool", type=("build", "link")) depends_on("m4", type="build") - depends_on("zlib", type="build") + depends_on("zlib-api", type="build") depends_on("pkgconfig", type="build") depends_on("bzip2", type="link") diff --git a/var/spack/repos/builtin/packages/paraver/package.py b/var/spack/repos/builtin/packages/paraver/package.py index 7cb1942da3..7764dcfc70 100644 --- a/var/spack/repos/builtin/packages/paraver/package.py +++ b/var/spack/repos/builtin/packages/paraver/package.py @@ -36,7 +36,7 @@ class Paraver(Package): depends_on("wxwidgets@2.8:") # NOTE: using external for this one is usually simpler depends_on("wxpropgrid@1.4:") depends_on("libxml2") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): os.chdir("ptools_common_files") diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index d98d1b6a27..5220bb1fbe 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -229,7 +229,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("libxml2") depends_on("lz4") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("libcatalyst@2:", when="+libcatalyst") depends_on("hip@5.2:", when="+rocm") for target in ROCmPackage.amdgpu_targets: diff --git a/var/spack/repos/builtin/packages/pbbam/package.py b/var/spack/repos/builtin/packages/pbbam/package.py index 5e76b22368..83361112f7 100644 --- a/var/spack/repos/builtin/packages/pbbam/package.py +++ b/var/spack/repos/builtin/packages/pbbam/package.py @@ -23,7 +23,7 @@ class Pbbam(MesonPackage): ) version("0.18.0", sha256="45286e5f7deb7ff629e0643c8a416155915aec7b85d54c60b5cdc07f4d7b234a") - depends_on("zlib") + depends_on("zlib-api") depends_on("boost@1.55.0:") depends_on("htslib@1.3.1:") # newer versions require C17 diff --git a/var/spack/repos/builtin/packages/perl-alien-svn/package.py b/var/spack/repos/builtin/packages/perl-alien-svn/package.py index 78d99ae459..579dca61ad 100644 --- a/var/spack/repos/builtin/packages/perl-alien-svn/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-svn/package.py @@ -26,7 +26,7 @@ class PerlAlienSvn(PerlPackage): depends_on("apr@1.6.2", type="build") depends_on("apr-util", type=("build", "link")) depends_on("sqlite", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("libbsd") def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py index 7deefb592c..365a6b7d9a 100644 --- a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py +++ b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py @@ -15,5 +15,5 @@ class PerlCompressRawZlib(PerlPackage): version("2.204", sha256="f161f4297efadbed79c8b096a75951784fc5ccd3170bd32866a19e5c6876d13f") version("2.081", sha256="e156de345bd224bbdabfcab0eeb3f678a3099a4e86c9d1b6771d880b55aa3a1b") - depends_on("zlib") + depends_on("zlib-api") depends_on("perl-extutils-makemaker", type="build") diff --git a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py index e1b08439ac..fb6756342f 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py @@ -15,8 +15,8 @@ class PerlPerlioGzip(PerlPackage): version("0.20", sha256="4848679a3f201e3f3b0c5f6f9526e602af52923ffa471a2a3657db786bd3bdc5") version("0.19", sha256="d2e9351d58b8a93c86811e25a898ee651fc393a157413652bf42f9aada2eb284") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") def configure_args(self): - p = self.spec["zlib"].prefix.include + p = self.spec["zlib-api"].prefix.include return ["INC=-I{0}".format(p)] diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 4971033896..50d5e1839e 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -124,9 +124,9 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package depends_on("gdbm@:1.14.1", when="@:5.28.0") depends_on("berkeley-db") depends_on("bzip2") - depends_on("zlib") + depends_on("zlib-api") # :5.24.1 needs zlib@:1.2.8: https://rt.cpan.org/Public/Bug/Display.html?id=120134 - depends_on("zlib@:1.2.8", when="@5.20.3:5.24.1") + conflicts("^zlib@1.2.9:", when="@5.20.3:5.24.1") conflicts("@5.34.1:", when="%msvc@:19.29.30136") # there has been a long fixed issue with 5.22.0 with regard to the ccflags @@ -134,6 +134,12 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # https://rt.perl.org/Public/Bug/Display.html?id=126468 patch("protect-quotes-in-ccflags.patch", when="@5.22.0") + # Support zlib-ng 2.1.2 and above for recent Perl + # Restrict zlib-ng to older versions for older Perl + # See https://github.com/pmqs/Compress-Raw-Zlib/issues/24 + patch("zlib-ng.patch", when="@5.38 ^zlib-ng@2.1.2:") + conflicts("zlib-ng@2.1.2:", when="@:5.37") + # Fix the Time-Local testase http://blogs.perl.org/users/tom_wyant/2020/01/my-y2020-bug.html patch( "https://rt.cpan.org/Public/Ticket/Attachment/1776857/956088/0001-Fix-Time-Local-tests.patch", @@ -453,8 +459,8 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package env.set("BZIP2_INCLUDE", spec["bzip2"].prefix.include) env.set("BZIP2_LIB", spec["bzip2"].libs.directories[0]) env.set("BUILD_ZLIB", 0) - env.set("ZLIB_INCLUDE", spec["zlib"].prefix.include) - env.set("ZLIB_LIB", spec["zlib"].libs.directories[0]) + env.set("ZLIB_INCLUDE", spec["zlib-api"].prefix.include) + env.set("ZLIB_LIB", spec["zlib-api"].libs.directories[0]) @run_after("install") def filter_config_dot_pm(self): diff --git a/var/spack/repos/builtin/packages/perl/zlib-ng.patch b/var/spack/repos/builtin/packages/perl/zlib-ng.patch new file mode 100644 index 0000000000..55f55bc59c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl/zlib-ng.patch @@ -0,0 +1,45 @@ +From 0a8fb7141a43b8e49609fb06f05fad5150a97c2a Mon Sep 17 00:00:00 2001 +From: pmqs <pmqs@cpan.org> +Date: Fri, 9 Jun 2023 14:30:36 +0100 +Subject: [PATCH] Change storage of ZLIBNG_VER_STATUS from IV to PV + https://github.com/pmqs/Compress-Raw-Zlib/issues/24 + +--- + Makefile.PL | 1 - + Zlib.xs | 11 +++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 299093b..5944918 100644 +--- a/cpan/Compress-Raw-Zlib/Makefile.PL ++++ b/cpan/Compress-Raw-Zlib/Makefile.PL +@@ -201,7 +201,6 @@ my @names = qw( + ZLIBNG_VER_MAJOR + ZLIBNG_VER_MINOR + ZLIBNG_VER_REVISION +- ZLIBNG_VER_STATUS + ZLIBNG_VER_MODIFIED + ); + +diff --git a/Zlib.xs b/Zlib.xs +index c47c66d..2d4fc58 100644 +--- a/cpan/Compress-Raw-Zlib/Zlib.xs ++++ b/cpan/Compress-Raw-Zlib/Zlib.xs +@@ -951,6 +951,17 @@ ZLIB_VERNUM() + uLong + Zip_zlibCompileFlags() + ++const char* ++ZLIBNG_VER_STATUS() ++ CODE: ++#ifdef ZLIBNG_VER_STATUS ++ RETVAL = STRINGIFY(ZLIBNG_VER_STATUS); ++#else ++ RETVAL = "0"; ++#endif ++ OUTPUT: ++ RETVAL ++ + MODULE = Compress::Raw::Zlib PACKAGE = Compress::Raw::Zlib PREFIX = Zip_ + + #define Zip_adler32(buf, adler) CRZ_adler32(adler, buf, (uInt)len) diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index db2ff3c1ce..61acffb77c 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -238,9 +238,9 @@ class Petsc(Package, CudaPackage, ROCmPackage): depends_on("hdf5+mpi", when="@3.13:+hdf5+mpi") depends_on("hdf5+mpi", when="+exodusii+mpi") depends_on("hdf5+mpi", when="+cgns+mpi") - depends_on("zlib", when="+hdf5") - depends_on("zlib", when="+libpng") - depends_on("zlib", when="+p4est") + depends_on("zlib-api", when="+hdf5") + depends_on("zlib-api", when="+libpng") + depends_on("zlib-api", when="+p4est") depends_on("parmetis+int64", when="+metis+mpi+int64") depends_on("parmetis~int64", when="+metis+mpi~int64") depends_on("valgrind", when="+valgrind") diff --git a/var/spack/repos/builtin/packages/pigz/package.py b/var/spack/repos/builtin/packages/pigz/package.py index bd4d62235f..2b5dd8a2c4 100644 --- a/var/spack/repos/builtin/packages/pigz/package.py +++ b/var/spack/repos/builtin/packages/pigz/package.py @@ -18,7 +18,7 @@ class Pigz(MakefilePackage): version("2.4", sha256="e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52") version("2.3.4", sha256="763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8") - depends_on("zlib") + depends_on("zlib-api") def build(self, spec, prefix): # force makefile to use cc as C compiler which is set by diff --git a/var/spack/repos/builtin/packages/plink-ng/package.py b/var/spack/repos/builtin/packages/plink-ng/package.py index afd59a9a23..a5b9a4c989 100644 --- a/var/spack/repos/builtin/packages/plink-ng/package.py +++ b/var/spack/repos/builtin/packages/plink-ng/package.py @@ -14,7 +14,7 @@ class PlinkNg(Package): version("200511", sha256="00cff19bece88acb7a21ba098501cb677b78d22c9f3ca5bcdc869139a40db816") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd@1.4.4:") depends_on("cblas") depends_on("blas") @@ -27,7 +27,7 @@ class PlinkNg(Package): return template.format(ver) def setup_build_environment(self, env): - zlib = join_path(self.spec["zlib"].prefix.lib, "libz.a") + zlib = join_path(self.spec["zlib-api"].prefix.lib, "libz.a") env.set("ZLIB", zlib) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/plink/package.py b/var/spack/repos/builtin/packages/plink/package.py index 9de14ebf20..3e44f039be 100644 --- a/var/spack/repos/builtin/packages/plink/package.py +++ b/var/spack/repos/builtin/packages/plink/package.py @@ -39,7 +39,7 @@ class Plink(Package): depends_on("netlib-lapack", when="@1.9-beta5:1.9-beta6.10") with when("@1.9-beta-6.27:"): - depends_on("zlib", when="@1.9-beta6.27:") + depends_on("zlib-api", when="@1.9-beta6.27:") depends_on("blas", when="@1.9-beta6.27:") depends_on("lapack", when="@1.9-beta6.27:") @@ -61,7 +61,7 @@ class Plink(Package): @when("@1.9-beta6.27:") def setup_build_environment(self, env): env.set("BLASFLAGS", self.spec["blas"].libs.ld_flags) - env.set("ZLIB", self.spec["zlib"].libs.ld_flags) + env.set("ZLIB", self.spec["zlib-api"].libs.ld_flags) @when("@1.9-beta6.27:") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/plink2/package.py b/var/spack/repos/builtin/packages/plink2/package.py index 7846f5ae4d..e7b3f79c95 100644 --- a/var/spack/repos/builtin/packages/plink2/package.py +++ b/var/spack/repos/builtin/packages/plink2/package.py @@ -15,7 +15,8 @@ class Plink2(MakefilePackage): version("2.00a4.3", tag="v2.00a4.3") - depends_on("zlib@1.2.12:") + depends_on("zlib-api") + depends_on("zlib@1.2.12:", when="^zlib") depends_on("zstd@1.5.2:") depends_on("libdeflate@1.10:") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index 296878ba02..6baaa7e9cf 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -185,7 +185,7 @@ class Plumed(AutotoolsPackage): ) # Dependencies. LAPACK and BLAS are recommended but not essential. - depends_on("zlib") + depends_on("zlib-api") depends_on("blas") depends_on("lapack") # For libmatheval support through the 'function' module diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index 376cd3746e..a7aea9ea94 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -29,7 +29,7 @@ class Pngwriter(CMakePackage): version("0.5.6", sha256="0c5f3c1fd6f2470e88951f4b8add64cf5f5a7e7038115dba69604139359b08f1") depends_on("libpng") - depends_on("zlib") + depends_on("zlib-api") depends_on("freetype") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 42bcf249d7..7b04a7639d 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -54,7 +54,7 @@ class Poppler(CMakePackage): depends_on("curl", when="+libcurl") depends_on("openjpeg", when="+openjpeg") depends_on("qt@4.0:", when="+qt") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("cairo+ft@1.10.0:", when="+glib") depends_on("iconv", when="+iconv") depends_on("jpeg", when="+jpeg") diff --git a/var/spack/repos/builtin/packages/portcullis/package.py b/var/spack/repos/builtin/packages/portcullis/package.py index 68b4eaad4d..09e9c62247 100644 --- a/var/spack/repos/builtin/packages/portcullis/package.py +++ b/var/spack/repos/builtin/packages/portcullis/package.py @@ -22,7 +22,7 @@ class Portcullis(AutotoolsPackage): depends_on("boost") depends_on("m4", type="build") - depends_on("zlib", type="build") + depends_on("zlib-api", type="build") depends_on("samtools", type="build") depends_on("python@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/povray/package.py b/var/spack/repos/builtin/packages/povray/package.py index 632af24a09..6f050f8cb2 100644 --- a/var/spack/repos/builtin/packages/povray/package.py +++ b/var/spack/repos/builtin/packages/povray/package.py @@ -66,7 +66,7 @@ class Povray(AutotoolsPackage): # for instance depends_on('boost +filesystem') # See https://github.com/spack/spack/pull/22303 for reference depends_on(Boost.with_default_variants, when="+boost") - depends_on("zlib@1.2.1:", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("libpng@1.2.5:", when="+libpng") depends_on("jpeg", when="+jpeg") depends_on("libtiff@3.6.1:", when="+libtiff") diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 491b6a80cd..a1a9a8e2d1 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -84,7 +84,7 @@ class Protobuf(CMakePackage): depends_on("abseil-cpp@20230125.3:", when="@3.22.5:") # https://github.com/protocolbuffers/protobuf/issues/11828#issuecomment-1433557509 depends_on("abseil-cpp@20230125:", when="@3.22:") - depends_on("zlib") + depends_on("zlib-api") conflicts("%gcc@:4.6", when="@3.6.0:") # Requires c++11 conflicts("%gcc@:4.6", when="@3.2.0:3.3.0") # Breaks diff --git a/var/spack/repos/builtin/packages/psmc/package.py b/var/spack/repos/builtin/packages/psmc/package.py index d2ba830df7..d027c89627 100644 --- a/var/spack/repos/builtin/packages/psmc/package.py +++ b/var/spack/repos/builtin/packages/psmc/package.py @@ -15,7 +15,7 @@ class Psmc(MakefilePackage): version("2016-1-21", commit="e5f7df5d00bb75ec603ae0beff62c0d7e37640b9") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") def setup_run_environment(self, env): env.prepend_path("PATH", self.prefix.bin.utils) diff --git a/var/spack/repos/builtin/packages/py-flye/package.py b/var/spack/repos/builtin/packages/py-flye/package.py index c3f57fc841..2e19485f86 100644 --- a/var/spack/repos/builtin/packages/py-flye/package.py +++ b/var/spack/repos/builtin/packages/py-flye/package.py @@ -25,7 +25,7 @@ class PyFlye(PythonPackage): depends_on("python@2.7:2.8,3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("gmake", type="build") - depends_on("zlib") + depends_on("zlib-api") msg = "C++ compiler with C++11 support required" conflicts("%gcc@:4.7", msg=msg) diff --git a/var/spack/repos/builtin/packages/py-grpcio-tools/package.py b/var/spack/repos/builtin/packages/py-grpcio-tools/package.py index c4bebb0584..e2cc8d79db 100644 --- a/var/spack/repos/builtin/packages/py-grpcio-tools/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio-tools/package.py @@ -25,7 +25,7 @@ class PyGrpcioTools(PythonPackage): depends_on("py-grpcio@1.39.0:", when="@1.39.0:1.41", type=("build", "run")) depends_on("py-cython@0.23:", type="build") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") depends_on("c-ares") depends_on("re2+shared") @@ -56,7 +56,7 @@ class PyGrpcioTools(PythonPackage): ) filter_file( r"(\s+ZLIB_INCLUDE = ).*", - r"\1('{0}',)".format(self.spec["zlib"].prefix.include), + r"\1('{0}',)".format(self.spec["zlib-api"].prefix.include), "setup.py", ) filter_file( diff --git a/var/spack/repos/builtin/packages/py-grpcio/package.py b/var/spack/repos/builtin/packages/py-grpcio/package.py index b0d6658fcf..6b798b792e 100644 --- a/var/spack/repos/builtin/packages/py-grpcio/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio/package.py @@ -39,7 +39,7 @@ class PyGrpcio(PythonPackage): depends_on("py-six@1.5.2:", when="@:1.48", type=("build", "run")) depends_on("py-cython@0.23:", type="build") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") depends_on("c-ares") depends_on("re2+shared") @@ -69,7 +69,7 @@ class PyGrpcio(PythonPackage): ) filter_file( r"(\s+ZLIB_INCLUDE = ).*", - r"\1('{0}',)".format(self.spec["zlib"].prefix.include), + r"\1('{0}',)".format(self.spec["zlib-api"].prefix.include), "setup.py", ) filter_file( diff --git a/var/spack/repos/builtin/packages/py-imagecodecs/package.py b/var/spack/repos/builtin/packages/py-imagecodecs/package.py index 1a84287556..03195578b6 100644 --- a/var/spack/repos/builtin/packages/py-imagecodecs/package.py +++ b/var/spack/repos/builtin/packages/py-imagecodecs/package.py @@ -42,7 +42,8 @@ class PyImagecodecs(PythonPackage): depends_on("libwebp@1.2.2:") depends_on("openjpeg@2.4.0:") depends_on("snappy@1.1.9:") - depends_on("zlib@1.2.11:") + depends_on("zlib-api") + depends_on("zlib@1.2.11:", when="^zlib") depends_on("zopfli@1.0.3: +shared") depends_on("zstd@1.5.2:") diff --git a/var/spack/repos/builtin/packages/py-onnxruntime/package.py b/var/spack/repos/builtin/packages/py-onnxruntime/package.py index 68929f6d3c..deed32f209 100644 --- a/var/spack/repos/builtin/packages/py-onnxruntime/package.py +++ b/var/spack/repos/builtin/packages/py-onnxruntime/package.py @@ -39,7 +39,7 @@ class PyOnnxruntime(CMakePackage, PythonExtension): depends_on("py-wheel", type="build") depends_on("py-onnx", type=("build", "run")) depends_on("py-flatbuffers", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") depends_on("libpng") depends_on("py-pybind11", type="build") depends_on("cuda", when="+cuda") diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 21152d37ef..5a6007e9e3 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -54,7 +54,7 @@ class PyPillowBase(PythonPackage): # Optional dependencies # https://pillow.readthedocs.io/en/latest/installation.html#external-libraries - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("jpeg", when="+jpeg") depends_on("libtiff", when="+tiff") depends_on("freetype", when="+freetype") diff --git a/var/spack/repos/builtin/packages/py-pynio/package.py b/var/spack/repos/builtin/packages/py-pynio/package.py index 70b0b7a0ad..ba757b68d4 100644 --- a/var/spack/repos/builtin/packages/py-pynio/package.py +++ b/var/spack/repos/builtin/packages/py-pynio/package.py @@ -22,7 +22,7 @@ class PyPynio(PythonPackage): # The setup.py claims it requires these abolutely. depends_on("libpng") depends_on("jpeg") - depends_on("zlib") + depends_on("zlib-api") # Spack does not currently have netcdf below 4.x, and 3.x is a # fundamentally different format. So, currently this is only providing diff --git a/var/spack/repos/builtin/packages/py-tables/package.py b/var/spack/repos/builtin/packages/py-tables/package.py index d6b7e9c61e..9f88bfd9ee 100644 --- a/var/spack/repos/builtin/packages/py-tables/package.py +++ b/var/spack/repos/builtin/packages/py-tables/package.py @@ -45,7 +45,7 @@ class PyTables(PythonPackage): # Versions prior to 3.3 must build with the internal blosc due to a lock # problem in a multithreaded environment. depends_on("c-blosc@1.4.1:", when="@3.3.0:") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("bzip2", when="+bzip2") depends_on("lzo", when="+lzo") diff --git a/var/spack/repos/builtin/packages/pypy/package.py b/var/spack/repos/builtin/packages/pypy/package.py index df57199054..3f1ec58764 100644 --- a/var/spack/repos/builtin/packages/pypy/package.py +++ b/var/spack/repos/builtin/packages/pypy/package.py @@ -36,7 +36,7 @@ class Pypy(Package): depends_on("libffi", when="+ctypes") depends_on("pkgconfig", when="+ctypes", type="build") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("bzip2", when="+bz2") depends_on("expat", when="+pyexpat") depends_on("sqlite", when="+sqlite3") diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index fd3b383bea..56ce86b136 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -249,7 +249,7 @@ class Python(Package): depends_on("sqlite@3.7.15:", when="@3.10:+sqlite3") depends_on("gdbm", when="+dbm") # alternatively ndbm or berkeley-db depends_on("libnsl", when="+nis") - depends_on("zlib@1.1.3:", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("bzip2", when="+bz2") depends_on("xz libs=shared", when="+lzma") depends_on("expat", when="+pyexpat") diff --git a/var/spack/repos/builtin/packages/qt-base/package.py b/var/spack/repos/builtin/packages/qt-base/package.py index 7997d19b0e..7818313f45 100644 --- a/var/spack/repos/builtin/packages/qt-base/package.py +++ b/var/spack/repos/builtin/packages/qt-base/package.py @@ -129,7 +129,7 @@ class QtBase(QtPackage): depends_on("icu4c") depends_on("libxml2") depends_on("pcre2+multibyte") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd") with when("platform=linux"): depends_on("libdrm") diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 78d1d02b55..d78ddd9c9a 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -160,7 +160,7 @@ class Qt(Package): depends_on("libmng") depends_on("libtiff") depends_on("libxml2") - depends_on("zlib") + depends_on("zlib-api") depends_on("freetype", when="+gui") depends_on("gtkplus", when="+gtk") depends_on("sqlite+column_metadata", when="+sql", type=("build", "run")) @@ -575,7 +575,7 @@ class Qt(Package): # FIXME: those could work for other versions use_spack_dep("libpng") use_spack_dep("jpeg", "libjpeg") - use_spack_dep("zlib") + use_spack_dep("zlib-api", "zlib") if "@:5.5" in spec: config_args.extend( diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index b0a5ee37ff..4d41903cd6 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -602,8 +602,8 @@ class GenericBuilder(spack.build_systems.generic.GenericBuilder): if spec.variants["hdf5"].value != "none": if spec.satisfies("@6.1.0:6.4.0") or (spec.satisfies("@6.4.1") and "+qmcpack" in spec): make_inc = join_path(self.pkg.stage.source_path, "make.inc") - zlib_libs = spec["zlib"].prefix.lib + " -lz" - filter_file(zlib_libs, format(spec["zlib"].libs.ld_flags), make_inc) + zlib_libs = spec["zlib-api"].prefix.lib + " -lz" + filter_file(zlib_libs, format(spec["zlib-api"].libs.ld_flags), make_inc) # QE 6.8 and later has parallel builds fixed if spec.satisfies("@:6.7"): diff --git a/var/spack/repos/builtin/packages/r-affyio/package.py b/var/spack/repos/builtin/packages/r-affyio/package.py index d196223dd1..06dd560743 100644 --- a/var/spack/repos/builtin/packages/r-affyio/package.py +++ b/var/spack/repos/builtin/packages/r-affyio/package.py @@ -28,4 +28,4 @@ class RAffyio(RPackage): depends_on("r@2.6.0:", type=("build", "run")) depends_on("r-zlibbioc", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-affyplm/package.py b/var/spack/repos/builtin/packages/r-affyplm/package.py index 4badcd5a8a..508d94b05d 100644 --- a/var/spack/repos/builtin/packages/r-affyplm/package.py +++ b/var/spack/repos/builtin/packages/r-affyplm/package.py @@ -35,4 +35,4 @@ class RAffyplm(RPackage): depends_on("r-gcrma", type=("build", "run")) depends_on("r-preprocesscore@1.5.1:", type=("build", "run")) depends_on("r-zlibbioc", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-bio3d/package.py b/var/spack/repos/builtin/packages/r-bio3d/package.py index b0559d67e8..accb401850 100644 --- a/var/spack/repos/builtin/packages/r-bio3d/package.py +++ b/var/spack/repos/builtin/packages/r-bio3d/package.py @@ -32,4 +32,4 @@ class RBio3d(RPackage): depends_on("r@3.1.0:", type=("build", "run")) depends_on("r-rcpp", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py index bad0fad593..fbb94c6375 100644 --- a/var/spack/repos/builtin/packages/r-cner/package.py +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -47,4 +47,4 @@ class RCner(RPackage): depends_on("r-go-db@3.3.0:", type=("build", "run")) depends_on("r-r-utils@2.3.0:", type=("build", "run")) depends_on("r-keggrest@1.14.0:", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-data-table/package.py b/var/spack/repos/builtin/packages/r-data-table/package.py index 8573dd4d4e..a967de5f66 100644 --- a/var/spack/repos/builtin/packages/r-data-table/package.py +++ b/var/spack/repos/builtin/packages/r-data-table/package.py @@ -38,4 +38,4 @@ class RDataTable(RPackage): version("1.9.6", sha256="6f74c349c1731823aef6899edcf18418454167d04eba983e3a6fe17ee9fd236e") depends_on("r@3.1.0:", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-git2r/package.py b/var/spack/repos/builtin/packages/r-git2r/package.py index 15f165f9f4..61b448242b 100644 --- a/var/spack/repos/builtin/packages/r-git2r/package.py +++ b/var/spack/repos/builtin/packages/r-git2r/package.py @@ -29,6 +29,6 @@ class RGit2r(RPackage): depends_on("r@3.1:", type=("build", "run")) depends_on("r@3.4:", type=("build", "run"), when="@0.31.0:") depends_on("libgit2") - depends_on("zlib") + depends_on("zlib-api") depends_on("openssl") depends_on("libssh2") diff --git a/var/spack/repos/builtin/packages/r-haven/package.py b/var/spack/repos/builtin/packages/r-haven/package.py index 213c3f2c2d..d7edaed6bf 100644 --- a/var/spack/repos/builtin/packages/r-haven/package.py +++ b/var/spack/repos/builtin/packages/r-haven/package.py @@ -37,6 +37,6 @@ class RHaven(RPackage): depends_on("r-vctrs@0.3.0:", type=("build", "run"), when="@2.3.1:") depends_on("r-cpp11", type=("build", "run"), when="@2.4:") depends_on("gmake", type="build") - depends_on("zlib", when="@2.4:") + depends_on("zlib-api", when="@2.4:") depends_on("r-rcpp@0.11.4:", type=("build", "run"), when="@:2.3") diff --git a/var/spack/repos/builtin/packages/r-hdf5array/package.py b/var/spack/repos/builtin/packages/r-hdf5array/package.py index dcb575aa95..b8e0e5ed1f 100644 --- a/var/spack/repos/builtin/packages/r-hdf5array/package.py +++ b/var/spack/repos/builtin/packages/r-hdf5array/package.py @@ -53,4 +53,4 @@ class RHdf5array(RPackage): depends_on("r-iranges", type=("build", "run")) depends_on("r-rhdf5lib", type=("build", "run"), when="@1.12.3:") depends_on("gmake", type="build") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index 9b9825b6c1..3a539d278f 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -35,6 +35,6 @@ class RHttpuv(RPackage): depends_on("r-later@0.8.0:", type=("build", "run"), when="@1.5.0:") depends_on("gmake", type="build") depends_on("zip") - depends_on("zlib", when="@1.6.4:") + depends_on("zlib-api", when="@1.6.4:") depends_on("r-bh", type=("build", "run"), when="@1.5.5") diff --git a/var/spack/repos/builtin/packages/r-mzr/package.py b/var/spack/repos/builtin/packages/r-mzr/package.py index b083a4d14b..fc2faa2600 100644 --- a/var/spack/repos/builtin/packages/r-mzr/package.py +++ b/var/spack/repos/builtin/packages/r-mzr/package.py @@ -40,6 +40,6 @@ class RMzr(RPackage): depends_on("r-ncdf4", type=("build", "run"), when="@2.16.2:") depends_on("r-rhdf5lib@1.1.4:", type=("build", "run"), when="@2.14.0:") depends_on("gmake", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("r-zlibbioc", type=("build", "run"), when="@:2.28.0") diff --git a/var/spack/repos/builtin/packages/r-popgenome/package.py b/var/spack/repos/builtin/packages/r-popgenome/package.py index 8e8f7cbda8..d53b3fcefc 100644 --- a/var/spack/repos/builtin/packages/r-popgenome/package.py +++ b/var/spack/repos/builtin/packages/r-popgenome/package.py @@ -24,4 +24,4 @@ class RPopgenome(RPackage): depends_on("r@2.14.2:", type=("build", "run")) depends_on("r-ff", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py index 56abc4f7dc..096a5ad025 100644 --- a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py @@ -24,4 +24,4 @@ class RRcppcnpy(RPackage): depends_on("r@3.1.0:", type=("build", "run")) depends_on("r-rcpp", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-rgl/package.py b/var/spack/repos/builtin/packages/r-rgl/package.py index ed0bd9004a..6f96a6f712 100644 --- a/var/spack/repos/builtin/packages/r-rgl/package.py +++ b/var/spack/repos/builtin/packages/r-rgl/package.py @@ -45,7 +45,7 @@ class RRgl(RPackage): depends_on("libx11") depends_on("gl") depends_on("glu") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("libpng@1.2.9:", type="link") depends_on("freetype", type="link") depends_on("pandoc@1.14:", type="build") diff --git a/var/spack/repos/builtin/packages/r-rhdf5/package.py b/var/spack/repos/builtin/packages/r-rhdf5/package.py index 1acd747396..c09c4cb20a 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5/package.py @@ -38,6 +38,6 @@ class RRhdf5(RPackage): depends_on("r-rhdf5lib@1.13.4:", type=("build", "run"), when="@2.38.0:") depends_on("r-rhdf5filters", type=("build", "run"), when="@2.34.0:") depends_on("gmake", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("r-zlibbioc", type=("build", "run"), when="@:2.28.1") diff --git a/var/spack/repos/builtin/packages/r-rhdf5filters/package.py b/var/spack/repos/builtin/packages/r-rhdf5filters/package.py index b13de3ad5e..9f29a05f4a 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5filters/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5filters/package.py @@ -21,7 +21,7 @@ class RRhdf5filters(RPackage): depends_on("r-rhdf5lib", type=("build", "run")) depends_on("gmake", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd") def configure_args(self): diff --git a/var/spack/repos/builtin/packages/r-rhdf5lib/package.py b/var/spack/repos/builtin/packages/r-rhdf5lib/package.py index 8005ec16f9..396626eae4 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5lib/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5lib/package.py @@ -27,4 +27,4 @@ class RRhdf5lib(RPackage): depends_on("r@4.0.0:", type="build", when="@1.16.0:") depends_on("r@4.2.0:", type=("build", "run"), when="@1.22.0:") depends_on("gmake", type="build") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py index 812d4daacb..fcf5c95a06 100644 --- a/var/spack/repos/builtin/packages/r-rjava/package.py +++ b/var/spack/repos/builtin/packages/r-rjava/package.py @@ -30,7 +30,7 @@ class RRjava(RPackage): depends_on("iconv") depends_on("pcre2") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") def setup_build_environment(self, env): spec = self.spec diff --git a/var/spack/repos/builtin/packages/r-rtracklayer/package.py b/var/spack/repos/builtin/packages/r-rtracklayer/package.py index 81412dc8e2..832d129de6 100644 --- a/var/spack/repos/builtin/packages/r-rtracklayer/package.py +++ b/var/spack/repos/builtin/packages/r-rtracklayer/package.py @@ -58,5 +58,5 @@ class RRtracklayer(RPackage): depends_on("r-genomicalignments@1.15.6:", type=("build", "run"), when="@1.40.6:") depends_on("r-biocio", type=("build", "run"), when="@1.54.0:") depends_on("r-restfulr@0.0.13:", type=("build", "run"), when="@1.54.0:") - depends_on("zlib") + depends_on("zlib-api") depends_on("openssl") diff --git a/var/spack/repos/builtin/packages/r-seqinr/package.py b/var/spack/repos/builtin/packages/r-seqinr/package.py index 4115f90af2..278c13b498 100644 --- a/var/spack/repos/builtin/packages/r-seqinr/package.py +++ b/var/spack/repos/builtin/packages/r-seqinr/package.py @@ -27,4 +27,4 @@ class RSeqinr(RPackage): depends_on("r@2.10.0:", type=("build", "run"), when="@4.2-30:") depends_on("r-ade4", type=("build", "run")) depends_on("r-segmented", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-shortread/package.py b/var/spack/repos/builtin/packages/r-shortread/package.py index 15cee95dae..85b766e191 100644 --- a/var/spack/repos/builtin/packages/r-shortread/package.py +++ b/var/spack/repos/builtin/packages/r-shortread/package.py @@ -53,4 +53,4 @@ class RShortread(RPackage): depends_on("r-latticeextra", type=("build", "run")) depends_on("r-xvector", type=("build", "run")) depends_on("r-rhtslib", type=("build", "run"), when="@1.48.0:") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-signac/package.py b/var/spack/repos/builtin/packages/r-signac/package.py index 669775b096..84bb7113cc 100644 --- a/var/spack/repos/builtin/packages/r-signac/package.py +++ b/var/spack/repos/builtin/packages/r-signac/package.py @@ -47,4 +47,4 @@ class RSignac(RPackage): depends_on("r-rcpp", type=("build", "run")) depends_on("r-tidyselect", type=("build", "run")) depends_on("r-vctrs", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-snpstats/package.py b/var/spack/repos/builtin/packages/r-snpstats/package.py index cf6460c2f9..b4038acea3 100644 --- a/var/spack/repos/builtin/packages/r-snpstats/package.py +++ b/var/spack/repos/builtin/packages/r-snpstats/package.py @@ -31,4 +31,4 @@ class RSnpstats(RPackage): depends_on("r-matrix", type=("build", "run")) depends_on("r-biocgenerics", type=("build", "run")) depends_on("r-zlibbioc", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-vcfr/package.py b/var/spack/repos/builtin/packages/r-vcfr/package.py index 9bed9c8323..83d2fa0c0d 100644 --- a/var/spack/repos/builtin/packages/r-vcfr/package.py +++ b/var/spack/repos/builtin/packages/r-vcfr/package.py @@ -37,4 +37,4 @@ class RVcfr(RPackage): depends_on("r-tibble", type=("build", "run")) depends_on("r-vegan", type=("build", "run")) depends_on("r-viridislite", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r-xvector/package.py b/var/spack/repos/builtin/packages/r-xvector/package.py index 7f4d0cc7a6..7bf098cc8c 100644 --- a/var/spack/repos/builtin/packages/r-xvector/package.py +++ b/var/spack/repos/builtin/packages/r-xvector/package.py @@ -41,4 +41,4 @@ class RXvector(RPackage): depends_on("r-iranges@2.15.12:", type=("build", "run"), when="@0.22.0:") depends_on("r-iranges@2.23.9:", type=("build", "run"), when="@0.30.0:") depends_on("r-zlibbioc", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index a38ee0b310..f72c192071 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -81,7 +81,8 @@ class R(AutotoolsPackage): depends_on("readline") depends_on("xz") depends_on("which", type=("build", "run")) - depends_on("zlib@1.2.5:") + depends_on("zlib-api") + depends_on("zlib@1.2.5:", when="^zlib") depends_on("texinfo", type="build") depends_on("cairo+X+gobject+pdf", when="+X") depends_on("pango+X", when="+X") diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index c0689bf416..f89b1a6a63 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -27,7 +27,7 @@ class Redset(CMakePackage): depends_on("mpi") depends_on("kvtree+mpi") depends_on("rankstr") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("kvtree@:1.3.0", when="@:0.2.0") depends_on("kvtree@1.4.0:", when="@0.3.0:") diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py index ee0a86eba3..63461f40e3 100644 --- a/var/spack/repos/builtin/packages/rempi/package.py +++ b/var/spack/repos/builtin/packages/rempi/package.py @@ -17,7 +17,7 @@ class Rempi(AutotoolsPackage): version("1.0.0", sha256="1cb21f457cf8a04632150156a2ba699dd0c3f81d47e8881a9b943b9bf575fa01") depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py b/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py index 37f2ab8197..d4d1dfb8ef 100644 --- a/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py +++ b/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py @@ -32,7 +32,7 @@ class RiscvGnuToolchain(AutotoolsPackage): depends_on("mpc", type="build") depends_on("gmp", type="build") depends_on("mpfr", type="build") - depends_on("zlib", type=("build", "link")) + depends_on("zlib-api", type=("build", "link")) depends_on("expat", type=("build", "link")) depends_on("bzip2", type="build") depends_on("gmake@4.3:", type="build") diff --git a/var/spack/repos/builtin/packages/rocksdb/package.py b/var/spack/repos/builtin/packages/rocksdb/package.py index b14675e4fb..fa17731302 100644 --- a/var/spack/repos/builtin/packages/rocksdb/package.py +++ b/var/spack/repos/builtin/packages/rocksdb/package.py @@ -42,7 +42,7 @@ class Rocksdb(MakefilePackage): depends_on("gflags") depends_on("lz4", when="+lz4") depends_on("snappy", when="+snappy") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("zstd", when="+zstd") depends_on("tbb", when="+tbb") @@ -67,8 +67,8 @@ class Rocksdb(MakefilePackage): cflags.append("-Wno-error=redundant-move") if "+zlib" in self.spec: - cflags.append("-I" + self.spec["zlib"].prefix.include) - ldflags.append(self.spec["zlib"].libs.ld_flags) + cflags.append("-I" + self.spec["zlib-api"].prefix.include) + ldflags.append(self.spec["zlib-api"].libs.ld_flags) else: env["ROCKSDB_DISABLE_ZLIB"] = "YES" diff --git a/var/spack/repos/builtin/packages/rocm-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index fb5aba5cd3..24d9c1e826 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -103,7 +103,7 @@ class RocmDeviceLibs(CMakePackage): depends_on("cmake@3.13.4:", type="build", when="@3.9.0:") depends_on("cmake@3.4.3:", type="build") - depends_on("zlib", type="link", when="@3.9.0:") + depends_on("zlib-api", type="link", when="@3.9.0:") depends_on("texinfo", type="link", when="@3.9.0:") depends_on("rocm-cmake@3.5.0:", type="build") diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py index 06600fe155..b7c58074af 100644 --- a/var/spack/repos/builtin/packages/rocm-gdb/package.py +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -105,7 +105,7 @@ class RocmGdb(AutotoolsPackage): depends_on("libunwind", type="build") depends_on("expat", type=("build", "link")) depends_on("python", type=("build", "link")) - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("babeltrace@1.2.4", type="link") depends_on("gmp", type=("build", "link"), when="@4.5.0:") diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py index 1f769ef834..c3f5c88c9a 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -115,7 +115,7 @@ class RocmValidationSuite(CMakePackage): ) depends_on("cmake@3.5:", type="build") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("yaml-cpp~shared") depends_on("googletest", when="@4.5.0:") depends_on("doxygen", type="build", when="@4.5.0:") diff --git a/var/spack/repos/builtin/packages/rocmlir/package.py b/var/spack/repos/builtin/packages/rocmlir/package.py index 36eab9ff6c..4df599d253 100644 --- a/var/spack/repos/builtin/packages/rocmlir/package.py +++ b/var/spack/repos/builtin/packages/rocmlir/package.py @@ -40,7 +40,7 @@ class Rocmlir(CMakePackage): depends_on("python", type="build") depends_on("z3", type="link") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("ncurses+termlib", type="link") depends_on("bzip2") depends_on("sqlite") diff --git a/var/spack/repos/builtin/packages/roms/package.py b/var/spack/repos/builtin/packages/roms/package.py index cd3cd7bd81..5590c22c03 100644 --- a/var/spack/repos/builtin/packages/roms/package.py +++ b/var/spack/repos/builtin/packages/roms/package.py @@ -44,7 +44,7 @@ class Roms(MakefilePackage): depends_on("netcdf-fortran") depends_on("netcdf-c") depends_on("hdf5+fortran") - depends_on("zlib") + depends_on("zlib-api") depends_on("curl") depends_on("amdlibm", when="%aocc") diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index ed3b1a3de3..07c668784f 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -223,7 +223,7 @@ class Root(CMakePackage): depends_on("pcre") depends_on("xxhash", when="@6.13.02:") # See cmake_args, below. depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd", when="@6.20:") # X-Graphics @@ -633,7 +633,7 @@ class Root(CMakePackage): # With that done, let's go fixing those deps if spec.satisfies("@:6.12"): - add_include_path("zlib") + add_include_path("zlib-api") if "+x" in spec: if spec.satisfies("@:6.08") or spec.satisfies("@6.22:"): add_include_path("xextproto") diff --git a/var/spack/repos/builtin/packages/routino/package.py b/var/spack/repos/builtin/packages/routino/package.py index 31f14e3c6d..00326fdc94 100644 --- a/var/spack/repos/builtin/packages/routino/package.py +++ b/var/spack/repos/builtin/packages/routino/package.py @@ -17,7 +17,7 @@ class Routino(MakefilePackage): version("3.3.3", sha256="abd82b77c314048f45030f7219887ca241b46d40641db6ccb462202b97a047f5") version("3.2", sha256="e2a431eaffbafab630835966d342e4ae25d5edb94c8ed419200e1ffb50bc7552") - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/rpm/package.py b/var/spack/repos/builtin/packages/rpm/package.py index 67fa90cd5e..66bce60f17 100644 --- a/var/spack/repos/builtin/packages/rpm/package.py +++ b/var/spack/repos/builtin/packages/rpm/package.py @@ -86,7 +86,7 @@ class Rpm(AutotoolsPackage): # compression support -- there is no configure option for many of these # and they autodetect the libraries, so it's better to just make them # hard requirements to avoid linking against system libraries. - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") depends_on("gzip") depends_on("xz") diff --git a/var/spack/repos/builtin/packages/rr/package.py b/var/spack/repos/builtin/packages/rr/package.py index d0f3025f91..a4fd6c6f89 100644 --- a/var/spack/repos/builtin/packages/rr/package.py +++ b/var/spack/repos/builtin/packages/rr/package.py @@ -18,7 +18,7 @@ class Rr(CMakePackage): depends_on("gdb") depends_on("git") - depends_on("zlib") + depends_on("zlib-api") # depends_on('capnproto', when='@4.6:') # not yet in spack # depends_on('libcapnp') # needed for future releases depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/rsl/package.py b/var/spack/repos/builtin/packages/rsl/package.py index 451a56354f..f2339360c7 100644 --- a/var/spack/repos/builtin/packages/rsl/package.py +++ b/var/spack/repos/builtin/packages/rsl/package.py @@ -17,7 +17,7 @@ class Rsl(AutotoolsPackage): depends_on("bzip2") depends_on("jpeg") - depends_on("zlib") + depends_on("zlib-api") depends_on("rpc") def configure_args(self): diff --git a/var/spack/repos/builtin/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py index 212e36571c..5b5f7ceeb1 100644 --- a/var/spack/repos/builtin/packages/rsync/package.py +++ b/var/spack/repos/builtin/packages/rsync/package.py @@ -24,7 +24,7 @@ class Rsync(AutotoolsPackage): version("3.1.2", sha256="ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2") version("3.1.1", sha256="7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621") - depends_on("zlib") + depends_on("zlib-api") depends_on("popt") depends_on("openssl", when="@3.2:") depends_on("xxhash", when="@3.2:") diff --git a/var/spack/repos/builtin/packages/rsyslog/package.py b/var/spack/repos/builtin/packages/rsyslog/package.py index b5f1f80af2..73ec7dc8ca 100644 --- a/var/spack/repos/builtin/packages/rsyslog/package.py +++ b/var/spack/repos/builtin/packages/rsyslog/package.py @@ -22,7 +22,7 @@ class Rsyslog(AutotoolsPackage): depends_on("m4", type="build") depends_on("libestr") depends_on("libfastjson") - depends_on("zlib") + depends_on("zlib-api") depends_on("uuid") depends_on("libgcrypt") depends_on("curl") diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index 5aa38a362a..88e3cc8e6f 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -18,7 +18,7 @@ class Rtags(CMakePackage): version("2.17", sha256="288fa49fedf647fb15e2ef10f0ebcd9de1a4ef1bbae3a3940870e136d32a3a60") depends_on("llvm@3.3: +clang") - depends_on("zlib") + depends_on("zlib-api") depends_on("openssl") depends_on("lua@5.3:") depends_on("bash-completion") diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 87a2e13071..60cbc76cd8 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -44,7 +44,7 @@ class Ruby(AutotoolsPackage, NMakePackage): depends_on("tcl", when="@:2.3") depends_on("tk", when="@:2.3") depends_on("readline", when="+readline") - depends_on("zlib") + depends_on("zlib-api") with when("+openssl"): depends_on("openssl@:1") depends_on("openssl@:1.0", when="@:2.3") diff --git a/var/spack/repos/builtin/packages/sabre/package.py b/var/spack/repos/builtin/packages/sabre/package.py index 6481a63ea1..fea74532d9 100644 --- a/var/spack/repos/builtin/packages/sabre/package.py +++ b/var/spack/repos/builtin/packages/sabre/package.py @@ -22,7 +22,7 @@ class Sabre(MakefilePackage): version("2013-09-27", commit="039a55e500ba07b7e6432ea6ec2ddcfb3471d949") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index 2aa2239dd6..b99bd2266b 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -49,7 +49,7 @@ class Salmon(CMakePackage): depends_on("cereal") depends_on("jemalloc") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") depends_on("libdivsufsort") depends_on("staden-io-lib~curl") diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index b063b16f59..58e0df44ec 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -61,7 +61,7 @@ class Samrai(AutotoolsPackage): variant("shared", default=False, description="Build shared libraries") depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") depends_on("hdf5+mpi") depends_on("m4", type="build") depends_on("boost@:1.64.0", when="@3.0.0:3.11", type="build") @@ -91,7 +91,7 @@ class Samrai(AutotoolsPackage): "--with-F77=%s" % self.spec["mpi"].mpifc, "--with-M4=%s" % self.spec["m4"].prefix, "--with-hdf5=%s" % self.spec["hdf5"].prefix, - "--with-zlib=%s" % self.spec["zlib"].prefix, + "--with-zlib=%s" % self.spec["zlib-api"].prefix, "--without-blas", "--without-lapack", "--with-hypre=no", diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index 5b52a663fb..d71ab637a9 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -37,7 +37,7 @@ class Samtools(Package): url="https://github.com/samtools/samtools/archive/0.1.8.tar.gz", ) - depends_on("zlib") + depends_on("zlib-api") depends_on("ncurses") depends_on("perl", type="run") depends_on("python", type="run") diff --git a/var/spack/repos/builtin/packages/sbml/package.py b/var/spack/repos/builtin/packages/sbml/package.py index 5d7ed286de..d5e25c8e9b 100644 --- a/var/spack/repos/builtin/packages/sbml/package.py +++ b/var/spack/repos/builtin/packages/sbml/package.py @@ -57,7 +57,7 @@ class Sbml(CMakePackage): depends_on("swig@2:", type="build") depends_on("cmake", type="build") - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/scantailor/package.py b/var/spack/repos/builtin/packages/scantailor/package.py index ff696710bd..3ffb13c790 100644 --- a/var/spack/repos/builtin/packages/scantailor/package.py +++ b/var/spack/repos/builtin/packages/scantailor/package.py @@ -22,7 +22,7 @@ class Scantailor(CMakePackage): depends_on("qt@5:") depends_on("libjpeg") - depends_on("zlib") + depends_on("zlib-api") depends_on("libpng") depends_on("libtiff") depends_on("boost@1.35:") diff --git a/var/spack/repos/builtin/packages/scipoptsuite/package.py b/var/spack/repos/builtin/packages/scipoptsuite/package.py index d983055b93..bc0f42f024 100644 --- a/var/spack/repos/builtin/packages/scipoptsuite/package.py +++ b/var/spack/repos/builtin/packages/scipoptsuite/package.py @@ -27,6 +27,6 @@ class Scipoptsuite(CMakePackage): version("7.0.1", sha256="971962f2d896b0c8b8fa554c18afd2b5037092685735d9494a05dc16d56ad422") depends_on("gmp") - depends_on("zlib") + depends_on("zlib-api") depends_on("readline") depends_on("ncurses") diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 861ea92426..12e81d7b96 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -58,7 +58,7 @@ class Scotch(CMakePackage, MakefilePackage): depends_on("flex@:2.6.1,2.6.4:", type="build") depends_on("bison@3.4:", type="build") depends_on("mpi", when="+mpi") - depends_on("zlib", when="+compression") + depends_on("zlib-api", when="+compression") # Version-specific patches patch("nonthreaded-6.0.4.patch", when="@6.0.4") @@ -103,7 +103,7 @@ class Scotch(CMakePackage, MakefilePackage): scotchlibs = find_libraries(libraries, root=self.prefix, recursive=True, shared=shared) if "+compression" in self.spec: - zlibs = self.spec["zlib"].libs + zlibs = self.spec["zlib-api"].libs return scotchlibs + zlibs @@ -207,7 +207,7 @@ class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder): if "+compression" in self.spec: cflags.append("-DCOMMON_FILE_COMPRESS_GZ") - ldflags.append(" {0} ".format(self.spec["zlib"].libs.joined())) + ldflags.append(" {0} ".format(self.spec["zlib-api"].libs.joined())) cflags.append("-DCOMMON_PTHREAD") diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 1a5d692106..2048d1b57d 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -66,7 +66,7 @@ class Scr(CMakePackage): ) depends_on("mpi") - depends_on("zlib") + depends_on("zlib-api") # Use latest iteration of dtcmp and components when installing scr@develop cmpnts = ["axl", "dtcmp", "er", "kvtree", "rankstr", "redset", "shuffile", "spath"] diff --git a/var/spack/repos/builtin/packages/seqan/package.py b/var/spack/repos/builtin/packages/seqan/package.py index b3d607c02b..b2022f0f9f 100644 --- a/var/spack/repos/builtin/packages/seqan/package.py +++ b/var/spack/repos/builtin/packages/seqan/package.py @@ -23,7 +23,7 @@ class Seqan(CMakePackage): depends_on("py-nose", type="build") depends_on("py-sphinx", type="build") depends_on("boost+exception+math+serialization+container", type=("build", "link")) - depends_on("zlib", type=("build", "link")) + depends_on("zlib-api", type=("build", "link")) depends_on("bzip2", type=("build", "link")) conflicts("%intel@:16.0.4") diff --git a/var/spack/repos/builtin/packages/seqprep/package.py b/var/spack/repos/builtin/packages/seqprep/package.py index b8f8a5fee5..37eb04380e 100644 --- a/var/spack/repos/builtin/packages/seqprep/package.py +++ b/var/spack/repos/builtin/packages/seqprep/package.py @@ -15,7 +15,7 @@ class Seqprep(MakefilePackage): version("1.3.2", sha256="2b8a462a0e0a3e51f70be7730dc77b1f2bb69e74845dd0fbd2110a921c32265a") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/seqtk/package.py b/var/spack/repos/builtin/packages/seqtk/package.py index 95d39f09cd..337cb8989a 100644 --- a/var/spack/repos/builtin/packages/seqtk/package.py +++ b/var/spack/repos/builtin/packages/seqtk/package.py @@ -17,7 +17,7 @@ class Seqtk(Package): version("1.2", sha256="bd53316645ab10f0aaba59e1e72c28442ee4c9c37fddaacce5e24757eff78d7b") version("1.1", sha256="f01b9f9af6e443673a0105a7536a01957a4fc371826385a1f3dd1e417aa91d52") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): make() diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index b87f1597dc..fea878d02e 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -29,7 +29,7 @@ class Serf(SConsPackage): depends_on("python+pythoncmd", type="build") depends_on("scons@2.3.0:", type="build") depends_on("uuid") - depends_on("zlib") + depends_on("zlib-api") patch("py3syntax.patch", when="@:1.3.9") patch("py3-hashbang.patch") @@ -40,7 +40,7 @@ class Serf(SConsPackage): "APR": spec["apr"].prefix, "APU": spec["apr-util"].prefix, "OPENSSL": spec["openssl"].prefix, - "ZLIB": spec["zlib"].prefix, + "ZLIB": spec["zlib-api"].prefix, "DEBUG": "yes" if "+debug" in spec else "no", } diff --git a/var/spack/repos/builtin/packages/sga/package.py b/var/spack/repos/builtin/packages/sga/package.py index 373346a87d..d220800555 100644 --- a/var/spack/repos/builtin/packages/sga/package.py +++ b/var/spack/repos/builtin/packages/sga/package.py @@ -24,7 +24,7 @@ class Sga(AutotoolsPackage): version("0.10.8", sha256="55c5e0e425e14902e83d68cfb8cee4c86ee186459e54113a484b2a1b06d223c8") version("0.10.3", sha256="c000823a58428d9db2979b30a571ad89aec78a8cb1af60bae1ce252dd4e8adac") - depends_on("zlib") + depends_on("zlib-api") depends_on("sparsehash") depends_on("jemalloc") depends_on("bamtools") diff --git a/var/spack/repos/builtin/packages/sgpp/package.py b/var/spack/repos/builtin/packages/sgpp/package.py index 3b6a18055a..716bc6fcd0 100644 --- a/var/spack/repos/builtin/packages/sgpp/package.py +++ b/var/spack/repos/builtin/packages/sgpp/package.py @@ -65,7 +65,7 @@ class Sgpp(SConsPackage): # Mandatory dependencies depends_on("scons", type=("build")) depends_on("scons@3:", when="@3.2.0:", type=("build")) - depends_on("zlib", type=("link")) + depends_on("zlib-api", type=("link")) # Python dependencies extends("python", when="+python") depends_on("py-pip", when="+python", type="build") diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index 309d30b95c..cf05d17b3d 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -25,7 +25,7 @@ class Shuffile(CMakePackage): depends_on("mpi") depends_on("kvtree+mpi") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("kvtree@:1.3.0", when="@:0.2.0") depends_on("kvtree@1.4.0:", when="@0.3.0:") diff --git a/var/spack/repos/builtin/packages/sickle/package.py b/var/spack/repos/builtin/packages/sickle/package.py index b9b0975de8..90c3e25d0b 100644 --- a/var/spack/repos/builtin/packages/sickle/package.py +++ b/var/spack/repos/builtin/packages/sickle/package.py @@ -17,7 +17,7 @@ class Sickle(MakefilePackage): version("1.33", sha256="eab271d25dc799e2ce67c25626128f8f8ed65e3cd68e799479bba20964624734") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 123ad8418d..77269d695d 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -59,7 +59,7 @@ class Silo(AutotoolsPackage): # Xmu dependency is required on Ubuntu 18-20 depends_on("libxmu", when="+silex") depends_on("readline") - depends_on("zlib") + depends_on("zlib-api") patch("remove-mpiposix.patch", when="@4.8:4.10.2") @@ -187,7 +187,7 @@ class Silo(AutotoolsPackage): # Do not specify the prefix of zlib if it is in a system directory # (see https://github.com/spack/spack/pull/21900). - zlib_prefix = self.spec["zlib"].prefix + zlib_prefix = self.spec["zlib-api"].prefix if is_system_path(zlib_prefix): config_args.append("--with-zlib=yes") else: diff --git a/var/spack/repos/builtin/packages/sio/package.py b/var/spack/repos/builtin/packages/sio/package.py index 2c86448a51..351fa4c3d5 100644 --- a/var/spack/repos/builtin/packages/sio/package.py +++ b/var/spack/repos/builtin/packages/sio/package.py @@ -37,7 +37,7 @@ class Sio(CMakePackage): description="Use the specified C++ standard when building.", ) - depends_on("zlib", when="~builtin_zlib") + depends_on("zlib-api", when="~builtin_zlib") def cmake_args(self): return [ diff --git a/var/spack/repos/builtin/packages/sjpeg/package.py b/var/spack/repos/builtin/packages/sjpeg/package.py index 4d0dfd7eb9..1479c73615 100644 --- a/var/spack/repos/builtin/packages/sjpeg/package.py +++ b/var/spack/repos/builtin/packages/sjpeg/package.py @@ -16,7 +16,7 @@ class Sjpeg(CMakePackage): depends_on("cmake@2.8.7:", type="build") # TODO: these dependencies seem to be optional? - # depends_on("zlib") + # depends_on("zlib-api") # depends_on("libpng") # depends_on("jpeg") # depends_on("gl") diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index 63585143ae..7c45253249 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -142,7 +142,7 @@ class Slurm(AutotoolsPackage): depends_on("openssl") depends_on("pkgconfig", type="build") depends_on("readline", when="+readline") - depends_on("zlib") + depends_on("zlib-api") depends_on("gtkplus", when="+gtk") depends_on("hdf5", when="+hdf5") @@ -180,7 +180,7 @@ class Slurm(AutotoolsPackage): "--with-lz4={0}".format(spec["lz4"].prefix), "--with-munge={0}".format(spec["munge"].prefix), "--with-ssl={0}".format(spec["openssl"].prefix), - "--with-zlib={0}".format(spec["zlib"].prefix), + "--with-zlib={0}".format(spec["zlib-api"].prefix), ] if "~gtk" in spec: diff --git a/var/spack/repos/builtin/packages/snap-berkeley/package.py b/var/spack/repos/builtin/packages/snap-berkeley/package.py index a2347cfcbd..ab9e3f6e0d 100644 --- a/var/spack/repos/builtin/packages/snap-berkeley/package.py +++ b/var/spack/repos/builtin/packages/snap-berkeley/package.py @@ -27,7 +27,7 @@ class SnapBerkeley(MakefilePackage): preferred=True, ) - depends_on("zlib") + depends_on("zlib-api") conflicts("%gcc@6:", when="@:1.0beta.18") diff --git a/var/spack/repos/builtin/packages/sniffles/package.py b/var/spack/repos/builtin/packages/sniffles/package.py index cc66f693ba..ffa92ae838 100644 --- a/var/spack/repos/builtin/packages/sniffles/package.py +++ b/var/spack/repos/builtin/packages/sniffles/package.py @@ -15,7 +15,7 @@ class Sniffles(CMakePackage): version("1.0.7", sha256="03fa703873bdf9c32055c584448e1eece45f94b4bc68e60c9624cf3841e6d8a9") version("1.0.5", sha256="386c6536bdaa4637579e235bac48444c08297337c490652d1e165accd34b258f") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("bamtools", type="link") patch("unused_libs.patch") diff --git a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py index a332bb9e00..6dd83ef30e 100644 --- a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py @@ -18,7 +18,7 @@ class SoapdenovoTrans(MakefilePackage): version("1.0.5", sha256="c1903c0d81142270db95916e2833400f72c4841b5c9194f182c19ebda418936f") version("1.0.4", sha256="378a54cde0ebe240fb515ba67197c053cf95393645c1ae1399b3a611be2a9795") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("samtools@0.1.8", type="link", when="target=aarch64:") build_directory = "src" diff --git a/var/spack/repos/builtin/packages/sortmerna/package.py b/var/spack/repos/builtin/packages/sortmerna/package.py index 68b351b89c..8a9cec6c26 100644 --- a/var/spack/repos/builtin/packages/sortmerna/package.py +++ b/var/spack/repos/builtin/packages/sortmerna/package.py @@ -15,7 +15,7 @@ class Sortmerna(CMakePackage): version("2017-07-13", commit="8bde6fa113a5d99a23ae81b48eeea6760e966094") - depends_on("zlib") + depends_on("zlib-api") depends_on("sse2neon", when="target=aarch64:") patch("for_aarch64.patch", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index 73b56f151b..d257645a91 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -23,7 +23,7 @@ class Spades(CMakePackage): version("3.10.1", sha256="d49dd9eb947767a14a9896072a1bce107fb8bf39ed64133a9e2f24fb1f240d96") depends_on("python", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") depends_on("bzip2") # SPAdes will explicitly not compile with gcc < 5.3.0 diff --git a/var/spack/repos/builtin/packages/spath/package.py b/var/spack/repos/builtin/packages/spath/package.py index 3cc4346ce9..fb4441bd1f 100644 --- a/var/spack/repos/builtin/packages/spath/package.py +++ b/var/spack/repos/builtin/packages/spath/package.py @@ -23,7 +23,7 @@ class Spath(CMakePackage): version("0.0.2", sha256="7a65be59c3d27e92ed4718fba1a97a4a1c68e0a552b54de13d58afe3d8199cf7") version("0.0.1", sha256="f41c0ac74e6fb8acfd0c072d756db0fc9c00441f22be492cc4ad25f7fb596a24") - depends_on("zlib", type="link", when="@:0.0.2") + depends_on("zlib-api", type="link", when="@:0.0.2") variant("mpi", default=True, description="Build with MPI support") depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin/packages/sqlcipher/package.py b/var/spack/repos/builtin/packages/sqlcipher/package.py index 501166e190..82b29b96c7 100644 --- a/var/spack/repos/builtin/packages/sqlcipher/package.py +++ b/var/spack/repos/builtin/packages/sqlcipher/package.py @@ -27,7 +27,7 @@ class Sqlcipher(AutotoolsPackage): depends_on("openssl") depends_on("tcl", type=["build"]) - depends_on("zlib") + depends_on("zlib-api") def configure_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 10af40ef2c..0f331f9640 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -59,7 +59,7 @@ class Sqlite(AutotoolsPackage): variant("rtree", default=True, description="Build with Rtree module") depends_on("readline") - depends_on("zlib") + depends_on("zlib-api") # See https://blade.tencent.com/magellan/index_en.html conflicts("+fts", when="@:3.25") diff --git a/var/spack/repos/builtin/packages/squashfs/package.py b/var/spack/repos/builtin/packages/squashfs/package.py index b32765627e..6a147b94a8 100644 --- a/var/spack/repos/builtin/packages/squashfs/package.py +++ b/var/spack/repos/builtin/packages/squashfs/package.py @@ -83,7 +83,7 @@ class Squashfs(MakefilePackage): msg="Cannot set default compression to missing algorithm", ) - depends_on("zlib", when="+gzip") + depends_on("zlib-api", when="+gzip") depends_on("lz4", when="+lz4") depends_on("lzo", when="+lzo") depends_on("xz", when="+xz") diff --git a/var/spack/repos/builtin/packages/squashfuse/package.py b/var/spack/repos/builtin/packages/squashfuse/package.py index 8c06506828..939b738c7d 100644 --- a/var/spack/repos/builtin/packages/squashfuse/package.py +++ b/var/spack/repos/builtin/packages/squashfuse/package.py @@ -40,7 +40,7 @@ class Squashfuse(AutotoolsPackage): depends_on("pkgconfig", type="build") # compression libs - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("lz4", when="+lz4") depends_on("lzo", when="+lzo") depends_on("xz", when="+xz") @@ -63,7 +63,10 @@ class Squashfuse(AutotoolsPackage): args = ["--disable-demo"] args += self.enable_or_disable("shared") args += self.enable_or_disable("static") - args += self.with_or_without("zlib", activation_value="prefix") + if "+zlib" in self.spec: + args.append("--with-zlib=%s" % self.spec["zlib-api"].prefix) + else: + args.append("--without-zlib") args += self.with_or_without("lz4", activation_value="prefix") args += self.with_or_without("lzo", activation_value="prefix") args += self.with_or_without("xz", activation_value="prefix") diff --git a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py index 3e442f1729..0724c7cd52 100644 --- a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py +++ b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py @@ -17,7 +17,7 @@ class SrcmlIdentifierGetterTool(CMakePackage): version("2022-10-17", commit="01394c247ae6f61cc5864a9697e72e3623d8e7fb", submodules=True) depends_on("libxml2") - depends_on("zlib") + depends_on("zlib-api") depends_on("lzma") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py index a2fba7728f..860d30d0b3 100644 --- a/var/spack/repos/builtin/packages/sst-core/package.py +++ b/var/spack/repos/builtin/packages/sst-core/package.py @@ -65,7 +65,7 @@ class SstCore(AutotoolsPackage): depends_on("mpi", when="+pdes_mpi") depends_on("zoltan", when="+zoltan") depends_on("hdf5", when="+hdf5") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("autoconf@1.68:", type="build") depends_on("automake@1.11.1:", type="build") @@ -87,7 +87,7 @@ class SstCore(AutotoolsPackage): if "+hdf5" in self.spec: args.append("--with-hdf5=%s" % self.spec["hdf5"].prefix) if "+zlib" in self.spec: - args.append("--with-zlib=%s" % self.spec["zlib"].prefix) + args.append("--with-zlib=%s" % self.spec["zlib-api"].prefix) if "+pdes_mpi" in self.spec: args.append("--enable-mpi") diff --git a/var/spack/repos/builtin/packages/sst-elements/package.py b/var/spack/repos/builtin/packages/sst-elements/package.py index 948725c740..49677daf04 100644 --- a/var/spack/repos/builtin/packages/sst-elements/package.py +++ b/var/spack/repos/builtin/packages/sst-elements/package.py @@ -76,7 +76,7 @@ class SstElements(AutotoolsPackage): depends_on("otf", when="+otf") depends_on("otf2", when="+otf2") depends_on("gettext") - depends_on("zlib") + depends_on("zlib-api") depends_on("autoconf@1.68:", type="build") depends_on("automake@1.11.1:", type="build") diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index adfa95cb9a..df129cfb4f 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -46,7 +46,7 @@ class SstMacro(AutotoolsPackage): depends_on("m4", type="build", when="@master:") depends_on("binutils", type="build") - depends_on("zlib", type=("build", "link")) + depends_on("zlib-api", type=("build", "link")) depends_on("otf2", when="+otf2") depends_on("llvm+clang@5:9", when="+skeletonizer") depends_on("mpi", when="+pdes_mpi") diff --git a/var/spack/repos/builtin/packages/stacks/package.py b/var/spack/repos/builtin/packages/stacks/package.py index 6c938ab39f..eebc9aacf4 100644 --- a/var/spack/repos/builtin/packages/stacks/package.py +++ b/var/spack/repos/builtin/packages/stacks/package.py @@ -21,7 +21,7 @@ class Stacks(AutotoolsPackage): depends_on("perl", type=("build", "run")) depends_on("sparsehash", when="+sparsehash") - depends_on("zlib", when="@2.3b:") + depends_on("zlib-api", when="@2.3b:") conflicts("%gcc@:4.9.0", when="@2.3b:") def configure_args(self): diff --git a/var/spack/repos/builtin/packages/staden-io-lib/package.py b/var/spack/repos/builtin/packages/staden-io-lib/package.py index 007fb69105..402e448735 100644 --- a/var/spack/repos/builtin/packages/staden-io-lib/package.py +++ b/var/spack/repos/builtin/packages/staden-io-lib/package.py @@ -19,7 +19,7 @@ class StadenIoLib(AutotoolsPackage): variant("curl", default=False, description="Build with curl support") - depends_on("zlib") + depends_on("zlib-api") depends_on("curl", when="+curl") def configure_args(self): diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 492e4a710f..18c7f9450c 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -33,7 +33,7 @@ class Star(MakefilePackage): url="https://github.com/alexdobin/STAR/archive/STAR_2.4.2a.tar.gz", ) - depends_on("zlib") + depends_on("zlib-api") build_directory = "source" diff --git a/var/spack/repos/builtin/packages/stress-ng/package.py b/var/spack/repos/builtin/packages/stress-ng/package.py index b76967e6f9..44a82def7e 100644 --- a/var/spack/repos/builtin/packages/stress-ng/package.py +++ b/var/spack/repos/builtin/packages/stress-ng/package.py @@ -22,7 +22,7 @@ class StressNg(MakefilePackage): depends_on("libbsd") depends_on("judy") depends_on("libatomic-ops") - depends_on("zlib") + depends_on("zlib-api") depends_on("keyutils") depends_on("libgcrypt") depends_on("libcap") diff --git a/var/spack/repos/builtin/packages/stringtie/package.py b/var/spack/repos/builtin/packages/stringtie/package.py index 91c1b6fb52..6fe5170ba4 100644 --- a/var/spack/repos/builtin/packages/stringtie/package.py +++ b/var/spack/repos/builtin/packages/stringtie/package.py @@ -18,7 +18,7 @@ class Stringtie(MakefilePackage): version("1.3.4a", sha256="6164a5fa9bf8807ef68ec89f47e3a61fe57fa07fe858f52fb6627f705bf71add") version("1.3.3b", sha256="30e8a3a29b474f0abeef1540d9b4624a827d8b29d7347226d86a38afea28bc0f") - depends_on("zlib") + depends_on("zlib-api") def build(self, spec, prefix): make("release") diff --git a/var/spack/repos/builtin/packages/su2/package.py b/var/spack/repos/builtin/packages/su2/package.py index 18d63aedd1..3e835484cd 100644 --- a/var/spack/repos/builtin/packages/su2/package.py +++ b/var/spack/repos/builtin/packages/su2/package.py @@ -52,7 +52,7 @@ class Su2(MesonPackage): depends_on("meson@0.61.1:", type=("build")) depends_on("python@3:", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") depends_on("pkgconfig") depends_on("mpi", when="+mpi") depends_on("swig", type="build", when="+pywrapper") diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index b694713b64..efff79a4f8 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -24,7 +24,7 @@ class Subread(MakefilePackage): version("1.6.0", sha256="31251ec4c134e3965d25ca3097890fb37e2c7a4163f6234515534fd325b1002a") version("1.5.2", sha256="a8c5f0e09ed3a105f01866517a89084c7302ff70c90ef8714aeaa2eab181a0aa") - depends_on("zlib") + depends_on("zlib-api") def build(self, spec, prefix): plat = sys.platform diff --git a/var/spack/repos/builtin/packages/subversion/package.py b/var/spack/repos/builtin/packages/subversion/package.py index 3d651c0fed..096bc828ab 100644 --- a/var/spack/repos/builtin/packages/subversion/package.py +++ b/var/spack/repos/builtin/packages/subversion/package.py @@ -41,7 +41,7 @@ class Subversion(AutotoolsPackage): depends_on("apr") depends_on("apr-util") - depends_on("zlib") + depends_on("zlib-api") depends_on("sqlite@3.8.2:") depends_on("expat") depends_on("lz4", when="@1.10:") @@ -67,7 +67,7 @@ class Subversion(AutotoolsPackage): spec["expat"].libs.directories[0], spec["expat"].libs.names[0], ), - "--with-zlib={0}".format(spec["zlib"].prefix), + "--with-zlib={0}".format(spec["zlib-api"].prefix), "--without-apxs", "--without-trang", "--without-doxygen", diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py index bd1ae02c51..b45813a21d 100644 --- a/var/spack/repos/builtin/packages/swig/package.py +++ b/var/spack/repos/builtin/packages/swig/package.py @@ -69,7 +69,7 @@ class Swig(AutotoolsPackage, SourceforgePackage): depends_on("pcre", when="@:4.0") depends_on("pcre2", when="@4.1:") - depends_on("zlib") + depends_on("zlib-api") AUTOCONF_VERSIONS = "@" + ",".join( [ diff --git a/var/spack/repos/builtin/packages/swipl/package.py b/var/spack/repos/builtin/packages/swipl/package.py index 41ff42a60b..3afeac5fce 100644 --- a/var/spack/repos/builtin/packages/swipl/package.py +++ b/var/spack/repos/builtin/packages/swipl/package.py @@ -45,7 +45,7 @@ class Swipl(CMakePackage): depends_on("unwind", when="+unwind") depends_on("unixodbc", when="+odbc") depends_on("openssl", when="+ssl") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("libxt", when="+xpce") depends_on("libx11", when="+xpce") diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index ef4592f058..85d88a6807 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -66,7 +66,7 @@ class Sz(CMakePackage, AutotoolsPackage): # with Fujitsu compiler. patch("fix_optimization.patch", when="@2.0.2.0:%fj") - depends_on("zlib") + depends_on("zlib-api") depends_on("zstd") extends("python", when="+python") diff --git a/var/spack/repos/builtin/packages/tabix/package.py b/var/spack/repos/builtin/packages/tabix/package.py index 8f4f94f60e..06d3140e87 100644 --- a/var/spack/repos/builtin/packages/tabix/package.py +++ b/var/spack/repos/builtin/packages/tabix/package.py @@ -16,7 +16,7 @@ class Tabix(MakefilePackage): depends_on("perl", type=("build", "run")) depends_on("python", type=("build", "run")) - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/tandem/package.py b/var/spack/repos/builtin/packages/tandem/package.py index d00b153725..bb294834db 100644 --- a/var/spack/repos/builtin/packages/tandem/package.py +++ b/var/spack/repos/builtin/packages/tandem/package.py @@ -43,7 +43,8 @@ class Tandem(CMakePackage): depends_on("libxsmm@1.17 +generator", when="+libxsmm target=x86_64:") depends_on("lua@5.3.2:5.4.4") depends_on("eigen@3.4.0") - depends_on("zlib@1.2.8:1.2.13") + depends_on("zlib-api") + depends_on("zlib@1.2.8:1.2.13", when="^zlib") depends_on("petsc@3.14.6:3.18.5 +int64 +mumps +scalapack") depends_on("petsc@3.14.6:3.18.5 +int64 +mumps +scalapack +knl", when="target=skylake:") # see https://github.com/TEAR-ERC/tandem/issues/45 diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 8bea62ce9a..85872cfa80 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -100,7 +100,7 @@ class Tau(Package): ) depends_on("cmake@3.14:", type="build", when="%clang") - depends_on("zlib", type="link") + depends_on("zlib-api", type="link") depends_on("pdt", when="+pdt") # Required for TAU instrumentation depends_on("scorep", when="+scorep") depends_on("otf2@2.1:2.3", when="+otf2") @@ -186,7 +186,7 @@ class Tau(Package): return compiler_options def setup_build_environment(self, env): - env.prepend_path("LIBRARY_PATH", self.spec["zlib"].prefix.lib) + env.prepend_path("LIBRARY_PATH", self.spec["zlib-api"].prefix.lib) env.prepend_path("LIBRARY_PATH", self.spec["hwloc"].prefix.lib) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index 951c9b8811..33bff65e25 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -33,7 +33,7 @@ class Tcl(AutotoolsPackage, SourceforgePackage): extendable = True - depends_on("zlib") + depends_on("zlib-api") configure_directory = "unix" diff --git a/var/spack/repos/builtin/packages/teckit/package.py b/var/spack/repos/builtin/packages/teckit/package.py index 318258cb7a..ab0c13f940 100644 --- a/var/spack/repos/builtin/packages/teckit/package.py +++ b/var/spack/repos/builtin/packages/teckit/package.py @@ -28,7 +28,7 @@ class Teckit(AutotoolsPackage): version("2.5.6", commit="41c20be2793e1afcbb8de6339af89d1eeab84fe8") version("2.5.5", commit="2733fd9895819e3697257550cc39b8e419c1ee7e") - depends_on("zlib") + depends_on("zlib-api") depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index 138134f202..6046dd006a 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -116,7 +116,7 @@ class Texlive(AutotoolsPackage): depends_on("pixman", when="@2019:") depends_on("poppler@:0.84", when="@2019:") depends_on("teckit", when="@2019:") - depends_on("zlib", when="@2019:") + depends_on("zlib-api", when="@2019:") depends_on("zziplib", when="@2019:") build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/the-silver-searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py index 8276f1ab74..b99fabdd76 100644 --- a/var/spack/repos/builtin/packages/the-silver-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-silver-searcher/package.py @@ -19,5 +19,5 @@ class TheSilverSearcher(AutotoolsPackage): depends_on("pcre") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/thepeg/package.py b/var/spack/repos/builtin/packages/thepeg/package.py index 3c09f7e47a..f1fe8300f0 100644 --- a/var/spack/repos/builtin/packages/thepeg/package.py +++ b/var/spack/repos/builtin/packages/thepeg/package.py @@ -73,7 +73,7 @@ class Thepeg(AutotoolsPackage): depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") - depends_on("zlib") + depends_on("zlib-api") variant("hepmc", default="2", values=("2", "3"), description="HepMC interface to build ") variant("rivet", default=True, description="Add rivet integration") @@ -95,7 +95,7 @@ class Thepeg(AutotoolsPackage): def configure_args(self): args = ["--with-gsl=" + self.spec["gsl"].prefix, "--without-javagui"] - args += ["--with-zlib=" + self.spec["zlib"].prefix] + args += ["--with-zlib=" + self.spec["zlib-api"].prefix] if self.spec.satisfies("@:1.8"): args += ["--with-LHAPDF=" + self.spec["lhapdf"].prefix] diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index b6a43aadd7..af4510cf96 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -53,7 +53,7 @@ class Thrift(Package): depends_on("openssl") # Variant dependencies - depends_on("zlib", when="+c") + depends_on("zlib-api", when="+c") depends_on("libevent", when="+c") depends_on("java@7:", when="+java") diff --git a/var/spack/repos/builtin/packages/tippecanoe/package.py b/var/spack/repos/builtin/packages/tippecanoe/package.py index 4f112c7051..015ce91807 100644 --- a/var/spack/repos/builtin/packages/tippecanoe/package.py +++ b/var/spack/repos/builtin/packages/tippecanoe/package.py @@ -17,7 +17,7 @@ class Tippecanoe(MakefilePackage): version("1.34.3", sha256="7a2dd2376a93d66a82c8253a46dbfcab3eaaaaca7bf503388167b9ee251bee54") depends_on("sqlite") - depends_on("zlib") + depends_on("zlib-api") def edit(self, spec, prefix): makefile = FileFilter("Makefile") diff --git a/var/spack/repos/builtin/packages/tkrzw/package.py b/var/spack/repos/builtin/packages/tkrzw/package.py index 8a10d659c3..e1541d60a6 100644 --- a/var/spack/repos/builtin/packages/tkrzw/package.py +++ b/var/spack/repos/builtin/packages/tkrzw/package.py @@ -65,7 +65,7 @@ class Tkrzw(AutotoolsPackage): description="List of supported compression backends", ) - depends_on("zlib", when="compression=zlib") + depends_on("zlib-api", when="compression=zlib") depends_on("lz4", when="compression=lz4") depends_on("xz", when="compression=lzma") # lzma.h is in the xz package, not in lzma depends_on("zstd", when="compression=zstd") diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index fc8afaa4b0..63075c77fa 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -402,7 +402,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): depends_on("superlu-dist", when="+superlu-dist") depends_on("superlu@4.3 +pic", when="+superlu") depends_on("swig", when="+python") - depends_on("zlib", when="+zoltan") + depends_on("zlib-api", when="+zoltan") # Trilinos' Tribits config system is limited which makes it very tricky to # link Amesos with static MUMPS, see @@ -768,7 +768,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): ("METIS", "metis"), ("Netcdf", "netcdf-c"), ("SCALAPACK", "scalapack"), - ("Zlib", "zlib"), + ("Zlib", "zlib-api"), ] if spec.satisfies("@12.12.1:"): tpl_dep_map.append(("Pnetcdf", "parallel-netcdf")) diff --git a/var/spack/repos/builtin/packages/tulip/package.py b/var/spack/repos/builtin/packages/tulip/package.py index 28dcaca3e9..135c6ba3db 100644 --- a/var/spack/repos/builtin/packages/tulip/package.py +++ b/var/spack/repos/builtin/packages/tulip/package.py @@ -29,7 +29,7 @@ class Tulip(CMakePackage): depends_on("qt") depends_on("qhull") depends_on("freetype") - depends_on("zlib") + depends_on("zlib-api") depends_on("glew") depends_on("jpeg") depends_on("libpng") diff --git a/var/spack/repos/builtin/packages/ucsc-bedclip/package.py b/var/spack/repos/builtin/packages/ucsc-bedclip/package.py index d1ea52d32c..dc6bda5e3b 100644 --- a/var/spack/repos/builtin/packages/ucsc-bedclip/package.py +++ b/var/spack/repos/builtin/packages/ucsc-bedclip/package.py @@ -20,7 +20,7 @@ class UcscBedclip(Package): depends_on("gmake") depends_on("mysql-connector-c") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") def setup_build_environment(self, env): env.set("MYSQLLIBS", "-lmysqlclient") diff --git a/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py b/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py index ccb84f38ea..87f01466f9 100644 --- a/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py +++ b/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py @@ -19,7 +19,7 @@ class UcscBedgraphtobigwig(Package): depends_on("libuuid") depends_on("gmake") depends_on("openssl") - depends_on("zlib") + depends_on("zlib-api") # This package has known issues installing with the latest MySQL because # MySQL removed the type my_bool, while mariadb didn't. # https://groups.google.com/a/soe.ucsc.edu/g/genome/c/mIT6fe9l99g diff --git a/var/spack/repos/builtin/packages/ufs-utils/package.py b/var/spack/repos/builtin/packages/ufs-utils/package.py index 7ac622fccb..587aa42542 100644 --- a/var/spack/repos/builtin/packages/ufs-utils/package.py +++ b/var/spack/repos/builtin/packages/ufs-utils/package.py @@ -39,7 +39,7 @@ class UfsUtils(CMakePackage): depends_on("sigio") depends_on("sp") depends_on("w3emc") - depends_on("zlib") + depends_on("zlib-api") def cmake_args(self): return [ diff --git a/var/spack/repos/builtin/packages/unblur/package.py b/var/spack/repos/builtin/packages/unblur/package.py index 00c57e291e..040f45e245 100644 --- a/var/spack/repos/builtin/packages/unblur/package.py +++ b/var/spack/repos/builtin/packages/unblur/package.py @@ -18,7 +18,7 @@ class Unblur(AutotoolsPackage): variant("openmp", default=True, description="Enable OpenMP support") variant("shared", default=True, description="Dynamic linking") - depends_on("zlib") + depends_on("zlib-api") depends_on("jpeg") depends_on("libtiff") depends_on("gsl") diff --git a/var/spack/repos/builtin/packages/util-linux/package.py b/var/spack/repos/builtin/packages/util-linux/package.py index 6c5c950cfb..b0c04e0f70 100644 --- a/var/spack/repos/builtin/packages/util-linux/package.py +++ b/var/spack/repos/builtin/packages/util-linux/package.py @@ -37,7 +37,7 @@ class UtilLinux(AutotoolsPackage): depends_on("python@2.7:", type="build") depends_on("pkgconfig", type="build") depends_on("ncurses", type="link") - depends_on("zlib", type="link") # sbin/mkfs.cramfs + depends_on("zlib-api", type="link") # sbin/mkfs.cramfs depends_on("libxcrypt", type="link") # sbin/sulogin variant("bash", default=False, description="Install bash completion scripts") diff --git a/var/spack/repos/builtin/packages/vampirtrace/package.py b/var/spack/repos/builtin/packages/vampirtrace/package.py index 37973070d8..2d4f7587fd 100644 --- a/var/spack/repos/builtin/packages/vampirtrace/package.py +++ b/var/spack/repos/builtin/packages/vampirtrace/package.py @@ -21,7 +21,7 @@ class Vampirtrace(AutotoolsPackage): depends_on("mpi", when="+mpi") depends_on("otf") depends_on("papi") - depends_on("zlib") + depends_on("zlib-api") # VampirTrace fails to build with newer versions of MPICH due to # https://github.com/pmodels/mpich/commit/c3dbc09ae20a503ac4b870893e3e330d52ea5a3b @@ -45,7 +45,7 @@ class Vampirtrace(AutotoolsPackage): "--with-extern-otf", "--with-extern-otf-dir={0}".format(spec["otf"].prefix), "--with-papi-dir={0}".format(spec["papi"].prefix), - "--with-zlib-dir={0}".format(spec["zlib"].prefix), + "--with-zlib-dir={0}".format(spec["zlib-api"].prefix), "--with-wrapper-cc-compiler={0}".format(compiler.cc), "--with-wrapper-cc-cpp={0} -E".format(compiler.cc), "--with-wrapper-cxx-compiler={0}".format(compiler.cxx), diff --git a/var/spack/repos/builtin/packages/vcftools/package.py b/var/spack/repos/builtin/packages/vcftools/package.py index ce0b38bc9a..944760be38 100644 --- a/var/spack/repos/builtin/packages/vcftools/package.py +++ b/var/spack/repos/builtin/packages/vcftools/package.py @@ -21,7 +21,7 @@ class Vcftools(AutotoolsPackage): version("0.1.14", sha256="76d799dd9afcb12f1ed42a07bc2886cd1a989858a4d047f24d91dcf40f608582") depends_on("perl", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") # this needs to be in sync with what setup_run_environment adds to # PERL5LIB below diff --git a/var/spack/repos/builtin/packages/velvet/package.py b/var/spack/repos/builtin/packages/velvet/package.py index 57902b4fa9..89b88feaff 100644 --- a/var/spack/repos/builtin/packages/velvet/package.py +++ b/var/spack/repos/builtin/packages/velvet/package.py @@ -15,7 +15,7 @@ class Velvet(MakefilePackage): version("1.2.10", sha256="884dd488c2d12f1f89cdc530a266af5d3106965f21ab9149e8cb5c633c977640") - depends_on("zlib") + depends_on("zlib-api") def edit(self, spec, prefix): if spec.target.family == "aarch64": diff --git a/var/spack/repos/builtin/packages/vigra/package.py b/var/spack/repos/builtin/packages/vigra/package.py index 7357524428..a64418d766 100644 --- a/var/spack/repos/builtin/packages/vigra/package.py +++ b/var/spack/repos/builtin/packages/vigra/package.py @@ -67,7 +67,7 @@ class Vigra(CMakePackage): "-DWITH_HDF5=ON", "-DHDF5_CORE_LIBRARY={0}".format(spec["hdf5"].libs.libraries[0]), "-DHDF5_INCLUDE_DIR={0}".format(spec["hdf5"].prefix.include), - "-DHDF5_Z_LIBRARY={0}".format(spec["zlib"].libs.libraries[0]), + "-DHDF5_Z_LIBRARY={0}".format(spec["zlib-api"].libs.libraries[0]), ] ) else: diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 290280e17d..e9362d0183 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -175,7 +175,7 @@ class Visit(CMakePackage): # vtk-m operations are performed. depends_on("vtk-m", patches=[patch("vtk-m_transport_tag_topology_field_in.patch")]) - depends_on("zlib") + depends_on("zlib-api") @when("@3:,develop") def patch(self): @@ -212,7 +212,7 @@ class Visit(CMakePackage): self.define("VTK_MAJOR_VERSION", spec["vtk"].version[0]), self.define("VTK_MINOR_VERSION", spec["vtk"].version[1]), self.define("VISIT_VTK_DIR", spec["vtk"].prefix), - self.define("VISIT_ZLIB_DIR", spec["zlib"].prefix), + self.define("VISIT_ZLIB_DIR", spec["zlib-api"].prefix), self.define("VISIT_JPEG_DIR", spec["jpeg"].prefix), self.define("VISIT_USE_GLEW", False), self.define("VISIT_CONFIG_SITE", "NONE"), diff --git a/var/spack/repos/builtin/packages/vizglow/package.py b/var/spack/repos/builtin/packages/vizglow/package.py index 7e0e28e090..99899d3d52 100644 --- a/var/spack/repos/builtin/packages/vizglow/package.py +++ b/var/spack/repos/builtin/packages/vizglow/package.py @@ -48,7 +48,7 @@ class Vizglow(Package): ) # depends_on('mesa') # TODO: mesa build doesn't work for me - depends_on("zlib") + depends_on("zlib-api") depends_on("freetype") depends_on("fontconfig") depends_on("libxrender") @@ -100,7 +100,7 @@ class Vizglow(Package): ld_library_path = ":".join( [ - spec["zlib"].prefix.lib, + spec["zlib-api"].prefix.lib, spec["freetype"].prefix.lib, spec["fontconfig"].prefix.lib, spec["libxrender"].prefix.lib, diff --git a/var/spack/repos/builtin/packages/vsearch/package.py b/var/spack/repos/builtin/packages/vsearch/package.py index cfe7855a03..0c28ce5a2b 100644 --- a/var/spack/repos/builtin/packages/vsearch/package.py +++ b/var/spack/repos/builtin/packages/vsearch/package.py @@ -23,4 +23,4 @@ class Vsearch(AutotoolsPackage): depends_on("automake", type="build") depends_on("bzip2") depends_on("libtool", type="build") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/vt/package.py b/var/spack/repos/builtin/packages/vt/package.py index 8142ae8ff4..284fa50be0 100644 --- a/var/spack/repos/builtin/packages/vt/package.py +++ b/var/spack/repos/builtin/packages/vt/package.py @@ -15,7 +15,7 @@ class Vt(MakefilePackage): version("0.5772", sha256="b147520478a2f7c536524511e48133d0360e88282c7159821813738ccbda97e7") version("0.577", sha256="009e2592e787ab37e471b4e8a66520141bb2791ca78142ca1767d27036f460d0") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, spack): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index c7bec82c74..9f35aea845 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -133,7 +133,7 @@ class Vtk(CMakePackage): depends_on("netcdf-cxx") depends_on("libpng") depends_on("libtiff") - depends_on("zlib") + depends_on("zlib-api") depends_on("eigen", when="@8.2.0:") depends_on("double-conversion", when="@8.2.0:") depends_on("sqlite", when="@8.2.0:") diff --git a/var/spack/repos/builtin/packages/weechat/package.py b/var/spack/repos/builtin/packages/weechat/package.py index ff34b175d6..9410c18154 100644 --- a/var/spack/repos/builtin/packages/weechat/package.py +++ b/var/spack/repos/builtin/packages/weechat/package.py @@ -30,7 +30,7 @@ class Weechat(CMakePackage): depends_on("aspell") depends_on("libgcrypt") depends_on("curl") - depends_on("zlib") + depends_on("zlib-api") depends_on("ruby@1.9.1:", when="+ruby") depends_on("tcl@8.5:", when="+tcl") depends_on("perl", when="+perl") diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 1f1784ff1a..16baac3a89 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -38,7 +38,7 @@ class Wget(AutotoolsPackage, GNUMirrorPackage): depends_on("gettext", type="build") depends_on("python@3:", type="build", when="+python") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("libpsl", when="+libpsl") depends_on("pcre", when="+pcre") diff --git a/var/spack/repos/builtin/packages/wgsim/package.py b/var/spack/repos/builtin/packages/wgsim/package.py index 30935a3187..f142338d4c 100644 --- a/var/spack/repos/builtin/packages/wgsim/package.py +++ b/var/spack/repos/builtin/packages/wgsim/package.py @@ -20,7 +20,7 @@ class Wgsim(Package): version("2011.10.17", commit="a12da3375ff3b51a5594d4b6fa35591173ecc229") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): cc = Executable(spack_cc) diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py index 64bb86e8fe..58d1a86f6e 100644 --- a/var/spack/repos/builtin/packages/whizard/package.py +++ b/var/spack/repos/builtin/packages/whizard/package.py @@ -64,7 +64,7 @@ class Whizard(AutotoolsPackage): when="+openloops", ) depends_on("texlive", when="+latex") - depends_on("zlib") + depends_on("zlib-api") # Fix for https://github.com/key4hep/key4hep-spack/issues/71 # NOTE: This will become obsolete in a future release of whizard, so once diff --git a/var/spack/repos/builtin/packages/wiredtiger/package.py b/var/spack/repos/builtin/packages/wiredtiger/package.py index 40a91502c4..f03f2c267e 100644 --- a/var/spack/repos/builtin/packages/wiredtiger/package.py +++ b/var/spack/repos/builtin/packages/wiredtiger/package.py @@ -19,7 +19,7 @@ class Wiredtiger(AutotoolsPackage): depends_on("swig", type=("build", "run"), when="+python") depends_on("lz4", when="+lz4") depends_on("snappy", when="+snappy") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") depends_on("zstd", when="+zstd") depends_on("rsync", type="build") diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index f4fe6f05d2..b1c4871f97 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -224,7 +224,7 @@ class Wrf(Package): depends_on("netcdf-fortran") depends_on("jasper") depends_on("libpng") - depends_on("zlib") + depends_on("zlib-api") depends_on("perl") depends_on("jemalloc", when="%aocc") # not sure if +fortran is required, but seems like a good idea diff --git a/var/spack/repos/builtin/packages/wt/package.py b/var/spack/repos/builtin/packages/wt/package.py index 6af01b57ea..9043912eea 100644 --- a/var/spack/repos/builtin/packages/wt/package.py +++ b/var/spack/repos/builtin/packages/wt/package.py @@ -59,7 +59,7 @@ class Wt(CMakePackage): depends_on("mariadb", when="+mariadb") depends_on("postgresql", when="+postgresql") depends_on("pango", when="+pango") - depends_on("zlib", when="+zlib") + depends_on("zlib-api", when="+zlib") def cmake_args(self): cmake_args = [ diff --git a/var/spack/repos/builtin/packages/wtdbg2/package.py b/var/spack/repos/builtin/packages/wtdbg2/package.py index 55148062db..9795f1a451 100644 --- a/var/spack/repos/builtin/packages/wtdbg2/package.py +++ b/var/spack/repos/builtin/packages/wtdbg2/package.py @@ -14,7 +14,7 @@ class Wtdbg2(MakefilePackage): version("2.3", sha256="fb61d38a4c60a39b3b194e63b855141c05ddcbe71cf244ae613766a9b0a56621") - depends_on("zlib") + depends_on("zlib-api") depends_on("sse2neon", when="target=aarch64:") patch("for_aarch64.patch", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/wxparaver/package.py b/var/spack/repos/builtin/packages/wxparaver/package.py index 210752836d..1018fffa3b 100644 --- a/var/spack/repos/builtin/packages/wxparaver/package.py +++ b/var/spack/repos/builtin/packages/wxparaver/package.py @@ -29,7 +29,7 @@ class Wxparaver(AutotoolsPackage): depends_on("wxwidgets@2.8:") # NOTE: using external for this one is usually simpler depends_on("wxpropgrid@1.4:") depends_on("libxml2") - depends_on("zlib") + depends_on("zlib-api") def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/xapian-core/package.py b/var/spack/repos/builtin/packages/xapian-core/package.py index aa13eec964..9c138d0a5e 100644 --- a/var/spack/repos/builtin/packages/xapian-core/package.py +++ b/var/spack/repos/builtin/packages/xapian-core/package.py @@ -19,4 +19,4 @@ class XapianCore(AutotoolsPackage): version("1.4.11", sha256="9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07") version("1.4.3", sha256="7d5295511ca2de70463a29e75f6a2393df5dc1485bf33074b778c66e1721e475") - depends_on("zlib") + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 0ebcc1cafc..9293ff69f2 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -119,7 +119,7 @@ class Xrootd(CMakePackage): depends_on("py-pip", type="build", when="@5.6: +python") depends_on("readline", when="+readline") depends_on("xz") - depends_on("zlib") + depends_on("zlib-api") depends_on("curl") depends_on("krb5", when="+krb5") depends_on("json-c") diff --git a/var/spack/repos/builtin/packages/yoda/package.py b/var/spack/repos/builtin/packages/yoda/package.py index 6cd22a6853..4cf2854566 100644 --- a/var/spack/repos/builtin/packages/yoda/package.py +++ b/var/spack/repos/builtin/packages/yoda/package.py @@ -68,7 +68,7 @@ class Yoda(AutotoolsPackage): depends_on("python", type=("build", "link", "run")) depends_on("py-future", type=("build", "run")) - depends_on("zlib") + depends_on("zlib-api") depends_on("boost", when="@:1.6.0", type=("build", "run")) # TODO: replace this with an explicit list of components of Boost, diff --git a/var/spack/repos/builtin/packages/zlib-ng/package.py b/var/spack/repos/builtin/packages/zlib-ng/package.py index a15dbdb086..a5615574ec 100644 --- a/var/spack/repos/builtin/packages/zlib-ng/package.py +++ b/var/spack/repos/builtin/packages/zlib-ng/package.py @@ -13,6 +13,7 @@ class ZlibNg(AutotoolsPackage, CMakePackage): homepage = "https://github.com/zlib-ng/zlib-ng" url = "https://github.com/zlib-ng/zlib-ng/archive/2.0.0.tar.gz" + version("2.1.3", sha256="d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a") version("2.1.2", sha256="383560d6b00697c04e8878e26c0187b480971a8bce90ffd26a5a7b0f7ecf1a33") version("2.0.7", sha256="6c0853bb27738b811f2b4d4af095323c3d5ce36ceed6b50e5f773204fb8f7200") version("2.0.0", sha256="86993903527d9b12fc543335c19c1d33a93797b3d4d37648b5addae83679ecd8") @@ -20,14 +21,24 @@ class ZlibNg(AutotoolsPackage, CMakePackage): variant("compat", default=True, description="Enable compatibility API") variant("opt", default=True, description="Enable optimizations") + provides("zlib-api", when="+compat") + # Default to autotools, since cmake would result in circular dependencies if it's not # reused. build_system("autotools", "cmake", default="autotools") + # rpath shenanigans, see https://github.com/zlib-ng/zlib-ng/pull/1546 + patch("pr-1546.patch", when="@2.1.3 platform=darwin") + with when("build_system=cmake"): depends_on("cmake@3.5.1:", type="build") depends_on("cmake@3.14.0:", type="build", when="@2.1.0:") + @property + def libs(self): + name = "libz" if self.spec.satisfies("+compat") else "libz-ng" + return find_libraries(name, root=self.prefix, recursive=True, shared=True) + class AutotoolsBuilder(autotools.AutotoolsBuilder): def configure_args(self): diff --git a/var/spack/repos/builtin/packages/zlib-ng/pr-1546.patch b/var/spack/repos/builtin/packages/zlib-ng/pr-1546.patch new file mode 100644 index 0000000000..8966cdd36b --- /dev/null +++ b/var/spack/repos/builtin/packages/zlib-ng/pr-1546.patch @@ -0,0 +1,182 @@ +From 101bc10dcef8d2cb45a51534180c7134001b07a9 Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels <me@harmenstoppels.nl> +Date: Mon, 24 Jul 2023 09:37:57 +0200 +Subject: [PATCH 1/3] Relative paths CMAKE_INSTALL_*, absolute paths + CMAKE_INSTALL_FULL_*; use @rpath/libname as install name on macOS + +--- + CMakeLists.txt | 46 ++-------------------------------------------- + configure | 7 +------ + test/pkgcheck.sh | 2 +- + 3 files changed, 4 insertions(+), 51 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 003e66db7..46b85bc48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -951,36 +951,8 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) + endif() + endif() + +-# Refer to prefix symbolically to ease relocation by end user, +-# as Makefile-generated .pc file does. +-string(FIND "${CMAKE_INSTALL_INCLUDEDIR}" "${CMAKE_INSTALL_PREFIX}/" INCLUDEDIR_POS) +-string(FIND "${CMAKE_INSTALL_LIBDIR}" "${CMAKE_INSTALL_PREFIX}/" LIBDIR_POS) +-string(LENGTH "${CMAKE_INSTALL_PREFIX}/" INSTALL_PREFIX_LEN) +- +-if(NOT IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") +- set(PC_INC_INSTALL_DIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +-elseif(INCLUDEDIR_POS EQUAL 0) +- string(SUBSTRING "${CMAKE_INSTALL_INCLUDEDIR}" "${INSTALL_PREFIX_LEN}" "-1" INCLUDEDIR_RELATIVE) +- set(PC_INC_INSTALL_DIR "\${prefix}/${INCLUDEDIR_RELATIVE}") +-else() +- set(PC_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") +-endif() +- +-if(APPLE) +- option(WITH_RPATH "Enable RPATH for shared library" OFF) +-endif() +-if(NOT IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") +- if(APPLE AND WITH_RPATH) +- set(PC_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") +- else() +- set(PC_LIB_INSTALL_DIR "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +- endif() +-elseif(LIBDIR_POS EQUAL 0) +- string(SUBSTRING "${CMAKE_INSTALL_LIBDIR}" "${INSTALL_PREFIX_LEN}" "-1" LIBDIR_RELATIVE) +- set(PC_LIB_INSTALL_DIR "\${exec_prefix}/${LIBDIR_RELATIVE}") +-else() +- set(PC_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") +-endif() ++set(PC_INC_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++set(PC_LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") + + #============================================================================ + # zlib +@@ -1142,11 +1114,6 @@ if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS) + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS + "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib${SUFFIX}.map\"") +- elseif(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}" OR NOT WITH_RPATH) +- # Match configure/make's behavior (i.e. don't use @rpath on mac when using absolute path). +- set_target_properties(zlib PROPERTIES INSTALL_NAME_DIR "@rpath/${CMAKE_INSTALL_FULL_LIBDIR}") +- else() +- set_target_properties(zlib PROPERTIES INSTALL_NAME_DIR "@rpath/${CMAKE_INSTALL_LIBDIR}") + endif() + endif() + if(MSYS) +@@ -1183,11 +1150,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib${SUFFIX}.h.in + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gzread.c.in + ${CMAKE_CURRENT_BINARY_DIR}/gzread.c @ONLY) + +-# Fix install directory after generating zlib.pc/zlib-ng.pc +-if (NOT IS_ABSOLUTE CMAKE_INSTALL_LIBDIR AND WITH_RPATH) +- set(CMAKE_INSTALL_LIBDIR "/${CMAKE_INSTALL_LIBDIR}") +-endif() +- + if (NOT ZLIB_SYMBOL_PREFIX STREQUAL "") + add_feature_info(ZLIB_SYMBOL_PREFIX ON "Publicly exported symbols have a custom prefix") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib_name_mangling${SUFFIX}.h.in +@@ -1286,8 +1248,4 @@ endif() + + add_feature_info(INSTALL_UTILS INSTALL_UTILS "Copy minigzip and minideflate during install") + +-if(APPLE) +- add_feature_info(WITH_RPATH WITH_RPATH "Enable RPATH for shared library") +-endif() +- + FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES) +diff --git a/configure b/configure +index 29a64badf..6881f7af5 100755 +--- a/configure ++++ b/configure +@@ -513,12 +513,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then + SHAREDLIBM=${LIBNAME}.$VER1$shared_ext + SHAREDTARGET=$SHAREDLIBV + LDSHARED=${LDSHARED-"$cc"} +- case ${libdir} in +- /*) +- LDSHAREDFLAGS="-dynamiclib -install_name ${libdir}/${SHAREDLIBM} -compatibility_version ${VER1} -current_version ${VER3}" ;; +- *) +- LDSHAREDFLAGS="-dynamiclib -install_name @rpath/${libdir}/${SHAREDLIBM} -compatibility_version ${VER1} -current_version ${VER3}" ;; +- esac ++ LDSHAREDFLAGS="-dynamiclib -install_name @rpath/${SHAREDLIBM} -compatibility_version ${VER1} -current_version ${VER3}" + if libtool -V 2>&1 | grep Apple > /dev/null; then + AR="libtool" + else +diff --git a/test/pkgcheck.sh b/test/pkgcheck.sh +index 629f98ade..6641b300a 100644 +--- a/test/pkgcheck.sh ++++ b/test/pkgcheck.sh +@@ -81,7 +81,7 @@ Darwin) + sysctl -n machdep.cpu.features + sysctl -n machdep.cpu.leaf7_features + sysctl -n machdep.cpu.extfeatures +- CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DPKGCONFIG_INSTALL_DIR=/lib/pkgconfig -DWITH_RPATH=on ${CMAKE_ARGS}" ++ CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib ${CMAKE_ARGS}" + CONFIGURE_ARGS="--libdir=lib ${CONFIGURE_ARGS}" + ;; + *) + +From c6fbd1459eda454402c3450c670b7e538233b8d4 Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels <me@harmenstoppels.nl> +Date: Mon, 24 Jul 2023 11:37:31 +0200 +Subject: [PATCH 2/3] relocatable pc files by default, while allowing + discouraged absolute paths for CMAKE_INSTALL_[LIB|INCLUDE]DIR + +--- + CMakeLists.txt | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46b85bc48..1894d10d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -951,8 +951,19 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) + endif() + endif() + +-set(PC_INC_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") +-set(PC_LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++# The user is allowed (but discouraged) to set absolute CMAKE_INSTALL_*DIR paths. ++# If they do, we copy these non-relocatable paths into the pkg-config file. ++if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") ++ set(PC_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") ++else() ++ set(PC_INC_INSTALL_DIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") ++endif() ++ ++if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") ++ set(PC_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") ++else() ++ set(PC_LIB_INSTALL_DIR "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") ++endif() + + #============================================================================ + # zlib + +From 0bae8f7d8379e5863b7c9328f0d71a87a33ca02f Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels <me@harmenstoppels.nl> +Date: Mon, 24 Jul 2023 10:20:32 +0200 +Subject: [PATCH 3/3] Remove relative configure --lib + +--- + test/pkgcheck.sh | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/test/pkgcheck.sh b/test/pkgcheck.sh +index 6641b300a..94a67a191 100644 +--- a/test/pkgcheck.sh ++++ b/test/pkgcheck.sh +@@ -81,11 +81,6 @@ Darwin) + sysctl -n machdep.cpu.features + sysctl -n machdep.cpu.leaf7_features + sysctl -n machdep.cpu.extfeatures +- CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib ${CMAKE_ARGS}" +- CONFIGURE_ARGS="--libdir=lib ${CONFIGURE_ARGS}" +- ;; +-*) +- CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib ${CMAKE_ARGS}" + ;; + esac + diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index f77e3e0e3d..e9425f93bf 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -56,6 +56,8 @@ class Zlib(MakefilePackage, Package): patch("w_patch.patch", when="@1.2.11%cce") patch("configure-cc.patch", when="@1.2.12") + provides("zlib-api") + @property def libs(self): shared = "+shared" in self.spec diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index 8c0cbd8bfe..385f261f17 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -53,7 +53,7 @@ class Zstd(CMakePackage, MakefilePackage): description="Enable support for additional compression methods in programs", ) - depends_on("zlib", when="compression=zlib") + depends_on("zlib-api", when="compression=zlib") depends_on("lz4", when="compression=lz4") depends_on("xz", when="compression=lzma") diff --git a/var/spack/repos/builtin/packages/zstr/package.py b/var/spack/repos/builtin/packages/zstr/package.py index 64ab609126..6750d7bbb5 100644 --- a/var/spack/repos/builtin/packages/zstr/package.py +++ b/var/spack/repos/builtin/packages/zstr/package.py @@ -22,7 +22,7 @@ class Zstr(Package): version("1.0.1", sha256="e17e67e00ede182504b3165cebd802420770541465d4ba41df1a15bf4c2a63b7") version("1.0.0", sha256="9f4fa8cb0d2cbba03dfe67900c48b6e75c8380d9263a0ac71d795f11e0224b96") - depends_on("zlib") + depends_on("zlib-api") def install(self, spec, prefix): """Make the install targets - Note that this package diff --git a/var/spack/repos/builtin/packages/zziplib/package.py b/var/spack/repos/builtin/packages/zziplib/package.py index 9559e2b132..08a00cdb2d 100644 --- a/var/spack/repos/builtin/packages/zziplib/package.py +++ b/var/spack/repos/builtin/packages/zziplib/package.py @@ -31,7 +31,7 @@ class Zziplib(AutotoolsPackage, CMakePackage): depends_on("python@3.5:", type="build", when="@0.13.72:") depends_on("python", type="build") - depends_on("zlib") + depends_on("zlib-api") # see zzip/CMakeLists.txt depends_on("coreutils", type="build", when="@0.13.72:") depends_on("pkgconfig", type="build", when="@0.13.72:") diff --git a/var/spack/repos/tutorial/packages/hdf5/package.py b/var/spack/repos/tutorial/packages/hdf5/package.py index 0fceeef891..94335d4ae4 100644 --- a/var/spack/repos/tutorial/packages/hdf5/package.py +++ b/var/spack/repos/tutorial/packages/hdf5/package.py @@ -104,7 +104,7 @@ class Hdf5(CMakePackage): if sys.platform != "darwin": depends_on("numactl", when="+mpi+fortran") depends_on("szip", when="+szip") - depends_on("zlib@1.1.2:") + depends_on("zlib-api") # The compiler wrappers (h5cc, h5fc, etc.) run 'pkg-config'. depends_on("pkgconfig", type="run") |