summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreugeneswalker <38933153+eugeneswalker@users.noreply.github.com>2021-05-03 11:10:56 -0700
committerGitHub <noreply@github.com>2021-05-03 20:10:56 +0200
commit977eff4db245172c840790c5f8bc076a6510e917 (patch)
tree778b7a53a995af3d3d84732235e361fd7d9f3948
parentfc06c1e08fee86066bf6e75743bb75d1a670051b (diff)
downloadspack-977eff4db245172c840790c5f8bc076a6510e917.tar.gz
spack-977eff4db245172c840790c5f8bc076a6510e917.tar.bz2
spack-977eff4db245172c840790c5f8bc076a6510e917.tar.xz
spack-977eff4db245172c840790c5f8bc076a6510e917.zip
flecsi: fix legion dependency specification so variants actually exist (#23391)
* flecsi: legion dependency has no variant +mpi, and +shared s.b. +shared_libs * rename legion variant +shared_libs to +shared
-rw-r--r--var/spack/repos/builtin/packages/flecsi/package.py2
-rw-r--r--var/spack/repos/builtin/packages/legion/package.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py
index 8dc8cea63d..df9492e0b3 100644
--- a/var/spack/repos/builtin/packages/flecsi/package.py
+++ b/var/spack/repos/builtin/packages/flecsi/package.py
@@ -62,7 +62,7 @@ class Flecsi(CMakePackage):
depends_on('mpi', when='backend=mpi')
depends_on('mpi', when='backend=legion')
depends_on('mpi', when='backend=hpx')
- depends_on('legion+shared+mpi', when='backend=legion')
+ depends_on('legion+shared', when='backend=legion')
depends_on('legion+hdf5', when='backend=legion +hdf5')
depends_on('legion build_type=Debug', when='backend=legion +debug_backend')
depends_on('hpx@1.4.1 cxxstd=17 malloc=system max_cpu_count=128', when='backend=hpx')
diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py
index d278a918f6..72aae80562 100644
--- a/var/spack/repos/builtin/packages/legion/package.py
+++ b/var/spack/repos/builtin/packages/legion/package.py
@@ -116,7 +116,7 @@ class Legion(CMakePackage):
conflicts('+gasnet_debug', when='network=mpi')
conflicts('+gasnet_debug', when='network=none')
- variant('shared_libs', default=False,
+ variant('shared', default=False,
description="Build shared libraries.")
variant('bounds_checks', default=False,
@@ -221,7 +221,7 @@ class Legion(CMakePackage):
raise InstallError("'gasnet_root' is only valid when 'network=gasnet'.")
options.append('-DLegion_EMBED_GASNet=OFF')
- if '+shared_libs' in spec:
+ if '+shared' in spec:
options.append('-DBUILD_SHARED_LIBS=ON')
else:
options.append('-DBUILD_SHARED_LIBS=OFF')