From 61d3d60414e100741f314c1080d74afe226e2bca Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Wed, 1 Jun 2022 12:06:03 -0500 Subject: Update HPX recipe for HPX V1.8.0 (#30896) --- var/spack/repos/builtin/packages/hpx/package.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index 335cbfeafe..e03576f8f2 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -16,7 +16,7 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage): homepage = "https://hpx.stellar-group.org/" url = "https://github.com/STEllAR-GROUP/hpx/archive/1.2.1.tar.gz" git = "https://github.com/STEllAR-GROUP/hpx.git" - maintainers = ['msimberg', 'albestro', 'teonnik'] + maintainers = ['msimberg', 'albestro', 'teonnik', 'hkaiser'] tags = ['e4s'] @@ -115,13 +115,11 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage): depends_on('papi', when='instrumentation=papi') depends_on('valgrind', when='instrumentation=valgrind') - # Restrictions for stable/master - with when("@master"): - conflicts("cxxstd=14") - depends_on("cuda@11:", when="+cuda") - - with when("@stable"): - conflicts("cxxstd=14") + # Restrictions for 1.8.X + with when('@1.8:'): + conflicts('cxxstd=14') + conflicts('%gcc@:7') + conflicts('%clang@:8') depends_on("cuda@11:", when="+cuda") # Restrictions for 1.7.X -- cgit v1.2.3-70-g09d2