zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[curl] Fix brotli option flag (#25166)

Browse Source 
Co-authored-by: Ali Ahmed <alia@splunk.com>
This commit is contained in:
Ali Ahmed 2021-08-02 12:46:56 -07:00 committed by GitHub
parent 6d810cb2e7
commit a60e3f80f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/curl/package.py
View File

@ -48,6 +48,9 @@ class Curl(AutotoolsPackage):
variant('libssh', default=False, description='enable libssh support') # , when='7.58:') 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('darwinssl', default=sys.platform == 'darwin', description="use Apple's SSL/TLS implementation")
variant('gssapi', default=False, description='enable Kerberos support') 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') conflicts('+libssh', when='@:7.57.99')
# on OSX and --with-ssh the configure steps fails with # on OSX and --with-ssh the configure steps fails with
@ -60,7 +63,7 @@ class Curl(AutotoolsPackage):
conflicts('platform=linux', when='+darwinssl') conflicts('platform=linux', when='+darwinssl')
depends_on('openssl', when='~darwinssl') depends_on('openssl', when='~darwinssl')
depends_on('libidn2') depends_on('libidn2', when='+libidn2')
depends_on('zlib') depends_on('zlib')
depends_on('nghttp2', when='+nghttp2') depends_on('nghttp2', when='+nghttp2')
depends_on('libssh2', when='+libssh2') depends_on('libssh2', when='+libssh2')
@ -72,10 +75,9 @@ def configure_args(self):
args = [ args = [
'--with-zlib=' + spec['zlib'].prefix, '--with-zlib=' + spec['zlib'].prefix,
'--with-libidn2=' + spec['libidn2'].prefix,
# Prevent unintentional linking against system libraries: we could # Prevent unintentional linking against system libraries: we could
# add variants for these in the future # add variants for these in the future
'--without-libbrotli', '--without-brotli',
'--without-libgsasl', '--without-libgsasl',
'--without-libmetalink', '--without-libmetalink',
'--without-libpsl', '--without-libpsl',
@ -92,7 +94,10 @@ def configure_args(self):
else: else:
args.append('--without-gssapi') 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('nghttp2')
args += self.with_or_without('libssh2') args += self.with_or_without('libssh2')
args += self.with_or_without('libssh') args += self.with_or_without('libssh')
args += self.enable_or_disable('ldap')
return args return args