Skip to content

Commit 753e8b5

Browse files
authored
xyce: fix self-referential dependencies (spack#42557)
1 parent af49f81 commit 753e8b5

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

var/spack/repos/builtin/packages/xyce/package.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class Xyce(CMakePackage):
116116
depends_on("[email protected]:14.4", when="@7.6.0:7.7.0")
117117
depends_on("[email protected]:13.4", when="@7.5")
118118
depends_on("[email protected]", when="@:7.4")
119-
depends_on("trilinos gotype=all cxxstd=11", when="^trilinos@:12.15")
119+
requires("^trilinos gotype=all cxxstd=11", when="^trilinos@:12.15")
120120
# pymi requires Kokkos/KokkosKernels >= 3.3, Trilinos 13.2 onward
121121
depends_on("[email protected]:", when="+pymi")
122122

@@ -133,27 +133,25 @@ class Xyce(CMakePackage):
133133
with when("+pymi_static_tpls"):
134134
# BLAS
135135
depends_on("blas")
136-
depends_on("openblas~shared", when="^openblas")
137-
depends_on("netlib-lapack~shared", when="^netlib-lapack~external-blas")
138-
139-
depends_on("armpl-gcc~shared", when="^armpl-gcc")
140-
depends_on("atlas~shared", when="^atlas")
136+
depends_on("openblas~shared", when="^[virtuals=blas] openblas")
137+
depends_on("netlib-lapack~shared", when="^[virtuals=blas] netlib-lapack~external-blas")
138+
depends_on("armpl-gcc~shared", when="^[virtuals=blas] armpl-gcc")
139+
depends_on("atlas~shared", when="^[virtuals=blas] atlas")
141140
depends_on("blis libs=static", when="^[virtuals=blas] blis+cblas")
142141
depends_on("blis libs=static", when="^[virtuals=blas] blis+blas")
143-
depends_on("clblast~shared", when="^clblast+netlib")
144-
depends_on("intel-mkl~shared", when="^intel-mkl")
145-
depends_on("intel-oneapi-mkl~shared", when="^intel-oneapi-mkl")
146-
depends_on("intel-parallel-studio~shared", when="^intel-parallel-studio+mkl")
147-
depends_on("veclibfort~shared", when="^veclibfort")
142+
depends_on("clblast~shared", when="^[virtuals=blas] clblast+netlib")
143+
depends_on("intel-mkl~shared", when="^[virtuals=blas] intel-mkl")
144+
depends_on("intel-oneapi-mkl~shared", when="^[virtuals=blas] intel-oneapi-mkl")
145+
depends_on(
146+
"intel-parallel-studio~shared", when="^[virtuals=blas] intel-parallel-studio+mkl"
147+
)
148+
depends_on("veclibfort~shared", when="^[virtuals=blas] veclibfort")
148149
conflicts("^essl", msg="essl not supported with +pymi_static_tpls")
149150
conflicts("^flexiblas", msg="flexiblas not supported with +pymi_static_tpls")
150151
conflicts("^nvhpc", msg="nvhpc not supported with +pymi_static_tpls")
151152
conflicts("^cray-libsci", msg="cray-libsci not supported with +pymi_static_tpls")
152153
# netlib-xblas+plain_blas is always static
153154

154-
# HDF5
155-
depends_on("hdf5~shared", when="^hdf5")
156-
157155
# fix MPI issue
158156
patch(
159157
"https://github.com/xyce/xyce/commit/2f95783637a5171a7f65f5d18c24d9a580a7f39e.patch?full_index=1",

0 commit comments

Comments
 (0)