From bb20cadd91d6d132d71a603f6cc2084971e73183 Mon Sep 17 00:00:00 2001 From: Paul Kuberry Date: Sat, 24 Jul 2021 05:20:51 -0600 Subject: [PATCH] Only add hwloc to tpl/dep list for certain versions of Trilinos (#25071) --- var/spack/repos/builtin/packages/trilinos/package.py | 8 +++++--- 1 file 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 264f182b1aa..ec16906cc13 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -613,14 +613,13 @@ def define_tpl_enable(cmake_var, spec_var=None): # 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 @@ def define_tpl_enable(cmake_var, spec_var=None): ('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: