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 /var/spack/repos/builtin/packages/curl/package.py | |
| 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.
Diffstat (limited to 'var/spack/repos/builtin/packages/curl/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/curl/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
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: |