diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-08-14 14:24:00 +0200 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2023-08-15 15:54:37 -0700 |
| commit | d3aca68e8f372ca124e7da2567e8936be23d54d3 (patch) | |
| tree | d303ea79c0d5ecc7a3eeb3334a58c92f076e1c70 /var | |
| parent | fb83f8ef310cac622f119c2ebc4125dabe7f8266 (diff) | |
| download | spack-d3aca68e8f372ca124e7da2567e8936be23d54d3.tar.gz spack-d3aca68e8f372ca124e7da2567e8936be23d54d3.tar.bz2 spack-d3aca68e8f372ca124e7da2567e8936be23d54d3.tar.xz spack-d3aca68e8f372ca124e7da2567e8936be23d54d3.zip | |
Rework conflicts so that "vendors" is not needed anymore
Diffstat (limited to 'var')
5 files changed, 11 insertions, 10 deletions
diff --git a/var/spack/repos/builtin.mock/packages/vendorsb/package.py b/var/spack/repos/builtin.mock/packages/vendorsb/package.py index 73fe9ad1cf..fbf14236a1 100644 --- a/var/spack/repos/builtin.mock/packages/vendorsb/package.py +++ b/var/spack/repos/builtin.mock/packages/vendorsb/package.py @@ -7,7 +7,7 @@ from spack.package import * class Vendorsb(Package): - """A package that vendors another""" + """A package that vendors another, and thus conflicts with it""" homepage = "http://www.example.com" url = "http://www.example.com/b-1.0.tar.gz" @@ -15,4 +15,5 @@ class Vendorsb(Package): version("1.1", md5="0123456789abcdef0123456789abcdef") version("1.0", md5="0123456789abcdef0123456789abcdef") - vendors("b", when="@=1.1") + # b is not a dependency + conflicts("b", when="@=1.1") diff --git a/var/spack/repos/builtin/packages/memkind/package.py b/var/spack/repos/builtin/packages/memkind/package.py index 12a0e18fd6..f51740f48e 100644 --- a/var/spack/repos/builtin/packages/memkind/package.py +++ b/var/spack/repos/builtin/packages/memkind/package.py @@ -40,7 +40,7 @@ class Memkind(AutotoolsPackage): # memkind includes a copy of jemalloc; see # <https://github.com/memkind/memkind#jemalloc>. - vendors("jemalloc") + conflicts("jemalloc") # https://github.com/spack/spack/issues/37292 parallel = False diff --git a/var/spack/repos/builtin/packages/palace/package.py b/var/spack/repos/builtin/packages/palace/package.py index 6eb8d87936..f7345f168f 100644 --- a/var/spack/repos/builtin/packages/palace/package.py +++ b/var/spack/repos/builtin/packages/palace/package.py @@ -95,8 +95,8 @@ class Palace(CMakePackage): depends_on("arpack-ng~shared", when="~shared") # Palace always builds its own internal MFEM, GSLIB - vendors("mfem") - vendors("gslib") + conflicts("mfem") + conflicts("gslib") # More dependency variant conflicts conflicts("^hypre+int64", msg="Palace uses HYPRE's mixedint option for 64 bit integers") diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 3a1e03cbbd..b009aec43d 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -70,8 +70,8 @@ class Scotch(CMakePackage, MakefilePackage): # Vendored dependency of METIS/ParMETIS conflicts with standard # installations - vendors("metis", when="+metis") - vendors("parmetis", when="+metis") + conflicts("metis", when="+metis") + conflicts("parmetis", when="+metis") parallel = False diff --git a/var/spack/repos/builtin/packages/votca/package.py b/var/spack/repos/builtin/packages/votca/package.py index 629c9eb0ad..db9d260f86 100644 --- a/var/spack/repos/builtin/packages/votca/package.py +++ b/var/spack/repos/builtin/packages/votca/package.py @@ -29,9 +29,9 @@ class Votca(CMakePackage): ) variant("xtp", default=True, description="Build xtp parts of votca") - vendors("votca-tools") - vendors("votca-csg") - vendors("votca-xtp") + conflicts("votca-tools") + conflicts("votca-csg") + conflicts("votca-xtp") depends_on("cmake@3.13:", type="build") depends_on("expat") |