zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfem, hpx: fix recipes after conditional variants (#27215)

Browse Source
This commit is contained in:
Massimiliano Culpo 2021-11-04 10:52:38 +01:00 committed by GitHub
parent 503576c017
commit 1dcabdbc8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/repos/builtin/packages/hpx/package.py
View File

@ -163,13 +163,16 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage):
patch('git_external.patch', when='@1.3.0 instrumentation=apex') patch('git_external.patch', when='@1.3.0 instrumentation=apex')
def instrumentation_args(self): def instrumentation_args(self):
for value in self.variants['instrumentation'].values: args = []
for value in self.variants['instrumentation'][0].values:
if value == 'none': if value == 'none':
continue continue
condition = 'instrumentation={0}'.format(value) condition = 'instrumentation={0}'.format(value)
yield self.define( args.append(self.define(
'HPX_WITH_{0}'.format(value.upper()), condition in self.spec) 'HPX_WITH_{0}'.format(value.upper()), condition in self.spec
))
return args
def cmake_args(self): def cmake_args(self):
spec, args = self.spec, [] spec, args = self.spec, []

2
var/spack/repos/builtin/packages/mfem/package.py
View File

@ -343,7 +343,7 @@ def is_sys_lib_path(dir):
if '+cuda' in spec: if '+cuda' in spec:
xcompiler = '-Xcompiler=' xcompiler = '-Xcompiler='
xlinker = '-Xlinker=' xlinker = '-Xlinker='
cuda_arch = spec.variants['cuda_arch'].value cuda_arch = None if '~cuda' in spec else spec.variants['cuda_arch'].value
# We need to add rpaths explicitly to allow proper export of link flags # We need to add rpaths explicitly to allow proper export of link flags
# from within MFEM. # from within MFEM.