summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorPaul Kuberry <pkuberry@gmail.com>2021-07-24 05:20:51 -0600
committerGitHub <noreply@github.com>2021-07-24 07:20:51 -0400
commitbb20cadd91d6d132d71a603f6cc2084971e73183 (patch)
tree8aa31d5c93cac80227f9849143f79dc17f7b55a3 /var
parent0beb35e4263b99c339bb1d5637fd9a87b8d4d350 (diff)
downloadspack-bb20cadd91d6d132d71a603f6cc2084971e73183.tar.gz
spack-bb20cadd91d6d132d71a603f6cc2084971e73183.tar.bz2
spack-bb20cadd91d6d132d71a603f6cc2084971e73183.tar.xz
spack-bb20cadd91d6d132d71a603f6cc2084971e73183.zip
Only add hwloc to tpl/dep list for certain versions of Trilinos (#25071)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 264f182b1a..ec16906cc1 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -613,14 +613,13 @@ class Trilinos(CMakePackage, CudaPackage):
# Enable TPLs based on whether they're in our spec, not whether they're
# variant names: packages/features should disable availability
- for tpl_name, dep_name in [
+ tpl_dep_map = [
('ADIOS2', 'adios2'),
('BLAS', 'blas'),
('Boost', 'boost'),
('CGNS', 'cgns'),
('HDF5', 'hdf5'),
('HYPRE', 'hypre'),
- ('HWLOC', 'hwloc'),
('LAPACK', 'lapack'),
('Matio', 'matio'),
('METIS', 'metis'),
@@ -629,7 +628,10 @@ class Trilinos(CMakePackage, CudaPackage):
('SuperLU', 'superlu'),
('X11', 'libx11'),
('Zlib', 'zlib'),
- ]:
+ ]
+ if spec.satisfies('@13:'):
+ tpl_dep_map.append(('HWLOC', 'hwloc'))
+ for tpl_name, dep_name in tpl_dep_map:
have_dep = (dep_name in spec)
options.append(define('TPL_ENABLE_' + tpl_name, have_dep))
if not have_dep: