hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flecsi: fix legion dependency specification so variants actually exist (#23391)

Browse source 
* flecsi: legion dependency has no variant +mpi, and +shared s.b. +shared_libs

* rename legion variant +shared_libs to +shared
This commit is contained in:
eugeneswalker 2021-05-03 11:10:56 -07:00 committed by GitHub
parent fc06c1e08f
commit 977eff4db2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
var/spack/repos/builtin/packages/flecsi/package.py
View file

@ -62,7 +62,7 @@ class Flecsi(CMakePackage):
depends_on('mpi', when='backend=mpi') depends_on('mpi', when='backend=mpi')
depends_on('mpi', when='backend=legion') depends_on('mpi', when='backend=legion')
depends_on('mpi', when='backend=hpx') 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+hdf5', when='backend=legion +hdf5')
depends_on('legion build_type=Debug', when='backend=legion +debug_backend') 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') depends_on('hpx@1.4.1 cxxstd=17 malloc=system max_cpu_count=128', when='backend=hpx')

4
var/spack/repos/builtin/packages/legion/package.py
View file

@ -116,7 +116,7 @@ def validate_gasnet_root(value):
conflicts('+gasnet_debug', when='network=mpi') conflicts('+gasnet_debug', when='network=mpi')
conflicts('+gasnet_debug', when='network=none') conflicts('+gasnet_debug', when='network=none')
variant('shared_libs', default=False, variant('shared', default=False,
description="Build shared libraries.") description="Build shared libraries.")
variant('bounds_checks', default=False, variant('bounds_checks', default=False,
@ -221,7 +221,7 @@ def cmake_args(self):
raise InstallError("'gasnet_root' is only valid when 'network=gasnet'.") raise InstallError("'gasnet_root' is only valid when 'network=gasnet'.")
options.append('-DLegion_EMBED_GASNet=OFF') options.append('-DLegion_EMBED_GASNet=OFF')
if '+shared_libs' in spec: if '+shared' in spec:
options.append('-DBUILD_SHARED_LIBS=ON') options.append('-DBUILD_SHARED_LIBS=ON')
else: else:
options.append('-DBUILD_SHARED_LIBS=OFF') options.append('-DBUILD_SHARED_LIBS=OFF')