summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Madlener <thomas.madlener@desy.de>2023-04-10 11:34:08 +0200
committerGitHub <noreply@github.com>2023-04-10 05:34:08 -0400
commitcb9ae0fa77c245ca999a5478b8a37b6a1c325987 (patch)
treed20f72ad52609a866274133cf11c366e3ed06df7
parentc35e59a6c4e8eb05a1f29dbedfc685535bda2498 (diff)
downloadspack-cb9ae0fa77c245ca999a5478b8a37b6a1c325987.tar.gz
spack-cb9ae0fa77c245ca999a5478b8a37b6a1c325987.tar.bz2
spack-cb9ae0fa77c245ca999a5478b8a37b6a1c325987.tar.xz
spack-cb9ae0fa77c245ca999a5478b8a37b6a1c325987.zip
krb5, xrootd: Make usable with OpenSSL 3 (#36728)
-rw-r--r--var/spack/repos/builtin/packages/krb5/package.py3
-rw-r--r--var/spack/repos/builtin/packages/xrootd/package.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/krb5/package.py b/var/spack/repos/builtin/packages/krb5/package.py
index 4a758de94d..08e70deeb9 100644
--- a/var/spack/repos/builtin/packages/krb5/package.py
+++ b/var/spack/repos/builtin/packages/krb5/package.py
@@ -31,7 +31,8 @@ class Krb5(AutotoolsPackage):
depends_on("diffutils", type="build")
depends_on("bison", type="build")
- depends_on("openssl@:1")
+ depends_on("openssl@:1", when="@:1.19")
+ depends_on("openssl")
depends_on("gettext")
variant(
diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py
index a4725a7a99..ffa40a3034 100644
--- a/var/spack/repos/builtin/packages/xrootd/package.py
+++ b/var/spack/repos/builtin/packages/xrootd/package.py
@@ -74,7 +74,8 @@ class Xrootd(CMakePackage):
depends_on("cmake@2.6:", type="build")
depends_on("libxml2", when="+http")
depends_on("uuid", when="@4.11.0:")
- depends_on("openssl@:1")
+ depends_on("openssl@:1", when="@:5.4")
+ depends_on("openssl")
depends_on("python", when="+python")
depends_on("readline", when="+readline")
depends_on("xz")