summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/petsc/package.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 853650c4ec..51ee1a9899 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -440,9 +440,6 @@ class Petsc(Package, CudaPackage, ROCmPackage):
else:
options.append('--with-clanguage=C')
- # Activates library support if needed (i.e. direct dependency)
- jpeg_sp = spec['jpeg'].name if 'jpeg' in spec else 'jpeg'
-
# to be used in the list of libraries below
if '+fortran' in spec:
hdf5libs = ':hl,fortran'
@@ -453,7 +450,11 @@ class Petsc(Package, CudaPackage, ROCmPackage):
# default: 'gmp', => ('gmp', 'gmp', True, True)
# any other combination needs a full tuple
# if not (useinc || uselib): usedir - i.e (False, False)
- direct_dependencies = [x.name for x in spec.dependencies()]
+ direct_dependencies = []
+ for dep in spec.dependencies():
+ direct_dependencies.append(dep.name)
+ direct_dependencies.extend(
+ set(vspec.name for vspec in dep.package.virtuals_provided))
for library in (
('cuda', 'cuda', False, False),
('hip', 'hip', True, False),
@@ -487,7 +488,7 @@ class Petsc(Package, CudaPackage, ROCmPackage):
('saws', 'saws', False, False),
('libyaml', 'yaml', True, True),
'hwloc',
- (jpeg_sp, 'libjpeg', True, True),
+ ('jpeg', 'libjpeg', True, True),
('scalapack', 'scalapack', False, True),
'strumpack',
'mmg',