From a60e3f80f683e3931120dba13615fb482e33d210 Mon Sep 17 00:00:00 2001 From: Ali Ahmed Date: Mon, 2 Aug 2021 12:46:56 -0700 Subject: [curl] Fix brotli option flag (#25166) Co-authored-by: Ali Ahmed --- var/spack/repos/builtin/packages/curl/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index a5ef685b8c..deee1c1b66 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -48,6 +48,9 @@ class Curl(AutotoolsPackage): variant('libssh', default=False, description='enable libssh support') # , when='7.58:') variant('darwinssl', default=sys.platform == 'darwin', description="use Apple's SSL/TLS implementation") variant('gssapi', default=False, description='enable Kerberos support') + variant('librtmp', default=False, description='enable Rtmp support') + variant('ldap', default=False, description='enable ldap support') + variant('libidn2', default=False, description='enable libidn2 support') conflicts('+libssh', when='@:7.57.99') # on OSX and --with-ssh the configure steps fails with @@ -60,7 +63,7 @@ class Curl(AutotoolsPackage): conflicts('platform=linux', when='+darwinssl') depends_on('openssl', when='~darwinssl') - depends_on('libidn2') + depends_on('libidn2', when='+libidn2') depends_on('zlib') depends_on('nghttp2', when='+nghttp2') depends_on('libssh2', when='+libssh2') @@ -72,10 +75,9 @@ class Curl(AutotoolsPackage): args = [ '--with-zlib=' + spec['zlib'].prefix, - '--with-libidn2=' + spec['libidn2'].prefix, # Prevent unintentional linking against system libraries: we could # add variants for these in the future - '--without-libbrotli', + '--without-brotli', '--without-libgsasl', '--without-libmetalink', '--without-libpsl', @@ -92,7 +94,10 @@ class Curl(AutotoolsPackage): else: args.append('--without-gssapi') + args += self.with_or_without('libidn2', 'prefix') + args += self.with_or_without('librtmp') args += self.with_or_without('nghttp2') args += self.with_or_without('libssh2') args += self.with_or_without('libssh') + args += self.enable_or_disable('ldap') return args -- cgit v1.2.3-70-g09d2