diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2024-02-08 21:04:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 21:04:58 +0100 |
| commit | 753e8b53d3f59651c30a14e2866c38f36cf9b1a4 (patch) | |
| tree | c0004c8432f44ac38c88cdd41a4b4749860f485c | |
| parent | af49f81ec598dbb214f13591c28929b34ba9a22f (diff) | |
| download | spack-753e8b53d3f59651c30a14e2866c38f36cf9b1a4.tar.gz spack-753e8b53d3f59651c30a14e2866c38f36cf9b1a4.tar.bz2 spack-753e8b53d3f59651c30a14e2866c38f36cf9b1a4.tar.xz spack-753e8b53d3f59651c30a14e2866c38f36cf9b1a4.zip | |
xyce: fix self-referential dependencies (#42557)
| -rw-r--r-- | var/spack/repos/builtin/packages/xyce/package.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py index 923e73445b..7422419c30 100644 --- a/var/spack/repos/builtin/packages/xyce/package.py +++ b/var/spack/repos/builtin/packages/xyce/package.py @@ -116,7 +116,7 @@ class Xyce(CMakePackage): depends_on("trilinos@13.5.0:14.4", when="@7.6.0:7.7.0") depends_on("trilinos@12.12.1:13.4", when="@7.5") depends_on("trilinos@12.12.1", when="@:7.4") - depends_on("trilinos gotype=all cxxstd=11", when="^trilinos@:12.15") + requires("^trilinos gotype=all cxxstd=11", when="^trilinos@:12.15") # pymi requires Kokkos/KokkosKernels >= 3.3, Trilinos 13.2 onward depends_on("trilinos@13.2.0:", when="+pymi") @@ -133,27 +133,25 @@ class Xyce(CMakePackage): with when("+pymi_static_tpls"): # BLAS depends_on("blas") - depends_on("openblas~shared", when="^openblas") - depends_on("netlib-lapack~shared", when="^netlib-lapack~external-blas") - - depends_on("armpl-gcc~shared", when="^armpl-gcc") - depends_on("atlas~shared", when="^atlas") + depends_on("openblas~shared", when="^[virtuals=blas] openblas") + depends_on("netlib-lapack~shared", when="^[virtuals=blas] netlib-lapack~external-blas") + depends_on("armpl-gcc~shared", when="^[virtuals=blas] armpl-gcc") + depends_on("atlas~shared", when="^[virtuals=blas] atlas") depends_on("blis libs=static", when="^[virtuals=blas] blis+cblas") depends_on("blis libs=static", when="^[virtuals=blas] blis+blas") - depends_on("clblast~shared", when="^clblast+netlib") - depends_on("intel-mkl~shared", when="^intel-mkl") - depends_on("intel-oneapi-mkl~shared", when="^intel-oneapi-mkl") - depends_on("intel-parallel-studio~shared", when="^intel-parallel-studio+mkl") - depends_on("veclibfort~shared", when="^veclibfort") + depends_on("clblast~shared", when="^[virtuals=blas] clblast+netlib") + depends_on("intel-mkl~shared", when="^[virtuals=blas] intel-mkl") + depends_on("intel-oneapi-mkl~shared", when="^[virtuals=blas] intel-oneapi-mkl") + depends_on( + "intel-parallel-studio~shared", when="^[virtuals=blas] intel-parallel-studio+mkl" + ) + depends_on("veclibfort~shared", when="^[virtuals=blas] veclibfort") conflicts("^essl", msg="essl not supported with +pymi_static_tpls") conflicts("^flexiblas", msg="flexiblas not supported with +pymi_static_tpls") conflicts("^nvhpc", msg="nvhpc not supported with +pymi_static_tpls") conflicts("^cray-libsci", msg="cray-libsci not supported with +pymi_static_tpls") # netlib-xblas+plain_blas is always static - # HDF5 - depends_on("hdf5~shared", when="^hdf5") - # fix MPI issue patch( "https://github.com/xyce/xyce/commit/2f95783637a5171a7f65f5d18c24d9a580a7f39e.patch?full_index=1", |