From 6d127e29de83511c76900091cbc1ff737a96d9df Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Mon, 2 Dec 2019 12:13:31 -0700 Subject: 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. --- var/spack/repos/builtin/packages/qt/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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:') -- cgit v1.2.3-70-g09d2