diff options
| author | Jim Galarowicz <jeg@trenzasynergy.com> | 2019-12-02 12:13:31 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-12-02 13:13:31 -0600 |
| commit | 6d127e29de83511c76900091cbc1ff737a96d9df (patch) | |
| tree | f4fe4781e42441c6ce8c5f8ea2c7583d96e21ff7 /var | |
| parent | 543f37ea51ce99ee6a2b33fc2d10dab8fdb7203f (diff) | |
| download | spack-6d127e29de83511c76900091cbc1ff737a96d9df.tar.gz spack-6d127e29de83511c76900091cbc1ff737a96d9df.tar.bz2 spack-6d127e29de83511c76900091cbc1ff737a96d9df.tar.xz spack-6d127e29de83511c76900091cbc1ff737a96d9df.zip | |
Fix conflict with respect to openssl and qt3 built for openspeedshop. (#13946)
* Fix conflict with respect to openssl and qt3 built for openspeedshop.
* Another fix because the first was incorrect.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 55e59cb788..cbac9ed141 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -139,7 +139,7 @@ class Qt(Package): depends_on("libpng@1.2.57", when='@3') depends_on("pcre+multibyte", when='@5.0:5.8') depends_on("inputproto", when='@:5.8') - depends_on("openssl@:1.0.999", when='@:5.9+ssl') + depends_on("openssl@:1.0.999", when='@:5.9+ssl~krellpatch') depends_on("glib", when='@4:') depends_on("libpng", when='@4:') |