diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2023-07-09 23:48:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-09 17:48:00 -0400 |
| commit | eef14ddcadb6af5beec76a2f5a3cb88d4b9eb1ef (patch) | |
| tree | 2445c57b8b50ddda55681ddc7d7dfa5e0b7e79c7 /var/spack/repos/builtin/packages/curl/package.py | |
| parent | db879a567928d3166365861d85dd1f3be4f0b36e (diff) | |
| download | spack-eef14ddcadb6af5beec76a2f5a3cb88d4b9eb1ef.tar.gz spack-eef14ddcadb6af5beec76a2f5a3cb88d4b9eb1ef.tar.bz2 spack-eef14ddcadb6af5beec76a2f5a3cb88d4b9eb1ef.tar.xz spack-eef14ddcadb6af5beec76a2f5a3cb88d4b9eb1ef.zip | |
openssl: prefer 3.x (#36729)
* openssl: prefer 3.x
This PR is not intended to be merged immediately, but it would be good
to see what packages fail to build in CI so that we can get proper
version constraints on openssl (before all packages update and support
both openssl 1 and 3)
* Disable assembly for 3.x %oneapi
* cmake: depend on spack curl, to deal with curl - openssl compat
* also make zlib external
* remove overly strict & unsafe requirement on py-cryptographty patch version number
* update openssl compat bounds in py-cryptography
* smaller diff
* Make libssh2 an autotools/cmake package
* fix weird upperbound in libssh2 as there is not openssl v2
* libssh2: pc file lists plain -lssl -lcrypto w/o leading -L flag, confusing libgit2 parsing of pkg-config output
* Actually fix the issue in libssh2: its pc file looks broken
Diffstat (limited to 'var/spack/repos/builtin/packages/curl/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/curl/package.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index b4f24e1a8c..f8a50829ac 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -278,7 +278,13 @@ class Curl(NMakePackage, AutotoolsPackage): depends_on("mbedtls@2: +pic", when="@7.79: tls=mbedtls") depends_on("mbedtls@:2 +pic", when="@:7.78 tls=mbedtls") depends_on("nss", when="tls=nss") - depends_on("openssl", when="tls=openssl") + + with when("tls=openssl"): + depends_on("openssl") + # Since https://github.com/curl/curl/commit/ee36e86ce8f77a017c49b8312814c33f4b969565 + # there is OpenSSL 3 detection. + depends_on("openssl@:1", when="@:7.76") + depends_on("libidn2", when="+libidn2") depends_on("zlib") depends_on("nghttp2", when="+nghttp2") |