diff options
| author | Jordan Galby <67924449+Jordan474@users.noreply.github.com> | 2022-05-20 18:24:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 18:24:30 +0200 |
| commit | 0b0920bc9047cbf3d4e8d8f1641af718b35ae31c (patch) | |
| tree | c81e1b0463d3753672d8eb30f89a033a101293fe | |
| parent | ee04a1ab0b5c37c889aa104945e645b4786c617b (diff) | |
| download | spack-0b0920bc9047cbf3d4e8d8f1641af718b35ae31c.tar.gz spack-0b0920bc9047cbf3d4e8d8f1641af718b35ae31c.tar.bz2 spack-0b0920bc9047cbf3d4e8d8f1641af718b35ae31c.tar.xz spack-0b0920bc9047cbf3d4e8d8f1641af718b35ae31c.zip | |
qt: Qt 5.15.0 requires OpenSSL 1.1.1 (#30754)
Fixes qt configure errors with external openssl on older systems (rhel7)
See
https://github.com/qt/qtbase/blob/efc02f9cc301f98c77079adae026ffd07f50d5ab/dist/changes-5.15.0#L346
This means for now on, `qt ^openssl@1.0` gets you `qt@5.15.4 ~ssl`:
clingo chooses latest qt version **but disables ssl support**.
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index b2c87ac79b..b01652e271 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -176,14 +176,17 @@ class Qt(Package): depends_on("zlib") depends_on("freetype", when='+gui') depends_on("gtkplus", when='+gtk') - depends_on("openssl", when='+ssl') depends_on("sqlite+column_metadata", when='+sql', type=('build', 'run')) depends_on("libpng@1.2.57", when='@3') depends_on("libsm", when='@3') depends_on("pcre+multibyte", when='@5.0:5.8') depends_on("inputproto", when='@:5.8') - depends_on("openssl@:1.0", when='@4:5.9+ssl') + + with when('+ssl'): + depends_on("openssl") + depends_on("openssl@:1.0", when='@4:5.9') + depends_on("openssl@1.1.1:", when='@5.15.0:') depends_on("glib", when='@4:') depends_on("libpng", when='@4:') |