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/gcc | |
| 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/gcc')
| -rw-r--r-- | var/spack/repos/builtin/packages/gcc/package.py | 8 |
1 files changed, 5 insertions, 3 deletions
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"): |