summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter Deconinck <wdconinc@gmail.com>2024-10-07 09:46:25 -0500
committerGitHub <noreply@github.com>2024-10-07 16:46:25 +0200
commit519684978bf5f23b16e41c8dc123bb4b773cc118 (patch)
tree0b5b80e9b5300f8c3cb65b527264b7c14fc5062c
parentc9de1cbcdac67a2a31b45e093237bf35079dec47 (diff)
downloadspack-519684978bf5f23b16e41c8dc123bb4b773cc118.tar.gz
spack-519684978bf5f23b16e41c8dc123bb4b773cc118.tar.bz2
spack-519684978bf5f23b16e41c8dc123bb4b773cc118.tar.xz
spack-519684978bf5f23b16e41c8dc123bb4b773cc118.zip
gnutls: add variant +brotli (#46814)
-rw-r--r--var/spack/repos/builtin/packages/gnutls/package.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py
index f405a8ecf0..d3ef1b8a32 100644
--- a/var/spack/repos/builtin/packages/gnutls/package.py
+++ b/var/spack/repos/builtin/packages/gnutls/package.py
@@ -38,6 +38,9 @@ class Gnutls(AutotoolsPackage):
variant("zlib", default=True, description="Enable zlib compression support")
variant("guile", default=False, description="Enable Guile bindings")
+ variant(
+ "brotli", default=True, description="Enable brotli compression support", when="@3.7.4:"
+ )
# gnutls+guile is currently broken on MacOS. See Issue #11668
conflicts("+guile", when="platform=darwin")
@@ -54,6 +57,7 @@ class Gnutls(AutotoolsPackage):
depends_on("libidn2@:2.0", when="@:3.5")
depends_on("libidn2")
depends_on("zlib-api", when="+zlib")
+ depends_on("brotli", when="+brotli")
depends_on("gettext")
depends_on("pkgconfig", type="build")
@@ -79,15 +83,9 @@ class Gnutls(AutotoolsPackage):
args.append("--with-included-unistring")
args.append("--without-p11-kit") # p11-kit@0.23.1: ...
- if spec.satisfies("+zlib"):
- args.append("--with-zlib")
- else:
- args.append("--without-zlib")
-
- if spec.satisfies("+guile"):
- args.append("--enable-guile")
- else:
- args.append("--disable-guile")
+ args += self.with_or_without("zlib")
+ args += self.with_or_without("brotli")
+ args += self.enable_or_disable("guile")
if self.run_tests:
args.extend(["--enable-tests", "--enable-valgrind-tests", "--enable-full-test-suite"])