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

Make sure we only pull in openssl w/ +ownlibs (#25559)

Browse Source
This commit is contained in:
Harmen Stoppels 2021-09-08 13:16:50 +02:00 committed by GitHub
parent 28f71c4d12
commit 7018a42211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/cmake/package.py
View File

@ -140,7 +140,7 @@ class Cmake(Package):
variant('ownlibs', default=True, description='Use CMake-provided third-party libraries') variant('ownlibs', default=True, description='Use CMake-provided third-party libraries')
variant('qt', default=False, description='Enables the build of cmake-gui') 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('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') variant('ncurses', default=True, description='Enables the build of the ncurses gui')
# Does not compile and is not covered in upstream CI (yet). # 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('qt', when='+qt')
depends_on('python@2.7.11:', when='+doc', type='build') depends_on('python@2.7.11:', when='+doc', type='build')
depends_on('py-sphinx', when='+doc', type='build') depends_on('py-sphinx', when='+doc', type='build')
depends_on('openssl', when='+openssl') depends_on('openssl', when='+openssl+ownlibs')
depends_on('openssl@:1.0.99', when='@:3.6.9+openssl') depends_on('openssl@:1.0.99', when='@:3.6.9+openssl+ownlibs')
depends_on('ncurses', when='+ncurses') depends_on('ncurses', when='+ncurses')
# Cannot build with Intel, should be fixed in 3.6.2 # Cannot build with Intel, should be fixed in 3.6.2