diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-09-08 13:16:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 05:16:50 -0600 |
| commit | 7018a422117b1dc2dd8c47183364c7321039fa19 (patch) | |
| tree | 924559fba2abfd4993642afd5bbcdfaaa4319e83 /var | |
| parent | 28f71c4d12e31cc42e272ef0f70fd4b16d5923a8 (diff) | |
| download | spack-7018a422117b1dc2dd8c47183364c7321039fa19.tar.gz spack-7018a422117b1dc2dd8c47183364c7321039fa19.tar.bz2 spack-7018a422117b1dc2dd8c47183364c7321039fa19.tar.xz spack-7018a422117b1dc2dd8c47183364c7321039fa19.zip | |
Make sure we only pull in openssl w/ +ownlibs (#25559)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index ba6fc8a5cd..9e8af3d2b7 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -140,7 +140,7 @@ class Cmake(Package): variant('ownlibs', default=True, description='Use CMake-provided third-party libraries') variant('qt', default=False, description='Enables the build of cmake-gui') variant('doc', default=False, description='Enables the generation of html and man page documentation') - variant('openssl', default=True, description="Enables CMake's OpenSSL features") + variant('openssl', default=True, description="Enable openssl for curl bootstrapped by CMake when using +ownlibs") variant('ncurses', default=True, description='Enables the build of the ncurses gui') # Does not compile and is not covered in upstream CI (yet). @@ -172,8 +172,8 @@ class Cmake(Package): depends_on('qt', when='+qt') depends_on('python@2.7.11:', when='+doc', type='build') depends_on('py-sphinx', when='+doc', type='build') - depends_on('openssl', when='+openssl') - depends_on('openssl@:1.0.99', when='@:3.6.9+openssl') + depends_on('openssl', when='+openssl+ownlibs') + depends_on('openssl@:1.0.99', when='@:3.6.9+openssl+ownlibs') depends_on('ncurses', when='+ncurses') # Cannot build with Intel, should be fixed in 3.6.2 |