Skip to content

Commit 3a6711f

Browse files
Attempting to be more strict on gcc not providing fortran
1 parent 03cb82a commit 3a6711f

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

repos/spack_repo/builtin/packages/paraview/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
173173
when="@5.3.0:5.13",
174174
multi=False,
175175
values=("default", "on", "off"),
176-
description="Build VTK-m(Viskores) with ParaView."
176+
description="Build VTK-m with ParaView."
177177
' "default" lets the build_edition make the decision.'
178178
' "on" or "off" will always override the build_edition.',
179179
)

stacks/e4s-oneapi/spack.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ spack:
88
reuse: false
99
unify: false
1010
static_analysis: false
11+
duplicates:
12+
max_dups:
13+
# This is needed because GCC is providing fortran even though it is unused
14+
fortran: 2
1115

1216
packages:
1317
all:
@@ -21,6 +25,8 @@ spack:
2125
blas: [openblas]
2226
tbb: [intel-tbb]
2327
variants: +mpi
28+
gcc:
29+
require: languages:='c,c++'
2430
gl:
2531
require: osmesa
2632
fortran:
@@ -46,13 +52,13 @@ spack:
4652
xz:
4753
variants: +pic
4854
gcc-runtime:
49-
require: 'target=x86_64_v3 %gcc'
55+
require: target=x86_64_v3 %gcc languages:='c,c++'
5056
binutils:
5157
variants: +ld +gold +headers +libiberty ~nls
5258
rust:
53-
require: 'target=x86_64_v3 %gcc'
59+
require: target=x86_64_v3 %gcc languages:='c,c++'
5460
bison:
55-
require: 'target=x86_64_v3 %gcc'
61+
require: target=x86_64_v3 %gcc languages:='c,c++'
5662
raja:
5763
variants: +plugins
5864
mpi:

0 commit comments

Comments
 (0)