diff options
author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-08-09 16:35:01 +0200 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2023-08-15 15:54:37 -0700 |
commit | 1db73eb1f222048fbdaf43835000ac17c12694bf (patch) | |
tree | a7f221f10b4acafb34f0be7b9896e5a1963f7524 /var | |
parent | 2da34de519c847d86f40ac16734ed4ef9e30c0c8 (diff) | |
download | spack-1db73eb1f222048fbdaf43835000ac17c12694bf.tar.gz spack-1db73eb1f222048fbdaf43835000ac17c12694bf.tar.bz2 spack-1db73eb1f222048fbdaf43835000ac17c12694bf.tar.xz spack-1db73eb1f222048fbdaf43835000ac17c12694bf.zip |
Add vendors directive
For the time being this directive prevents the vendored package
to be in the same DAG as the one vendoring it.
Diffstat (limited to 'var')
5 files changed, 28 insertions, 9 deletions
diff --git a/var/spack/repos/builtin.mock/packages/vendorsb/package.py b/var/spack/repos/builtin.mock/packages/vendorsb/package.py new file mode 100644 index 0000000000..73fe9ad1cf --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/vendorsb/package.py @@ -0,0 +1,18 @@ +# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Vendorsb(Package): + """A package that vendors another""" + + homepage = "http://www.example.com" + url = "http://www.example.com/b-1.0.tar.gz" + + version("1.1", md5="0123456789abcdef0123456789abcdef") + version("1.0", md5="0123456789abcdef0123456789abcdef") + + vendors("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 f51740f48e..12a0e18fd6 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>. - conflicts("jemalloc") + vendors("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 fd06706db1..6eb8d87936 100644 --- a/var/spack/repos/builtin/packages/palace/package.py +++ b/var/spack/repos/builtin/packages/palace/package.py @@ -94,9 +94,9 @@ class Palace(CMakePackage): depends_on("arpack-ng+shared", when="+shared") depends_on("arpack-ng~shared", when="~shared") - # Conflicts: Palace always builds its own internal MFEM, GSLIB - conflicts("^mfem", msg="Palace builds its own internal MFEM") - conflicts("^gslib", msg="Palace builds its own internal GSLIB") + # Palace always builds its own internal MFEM, GSLIB + vendors("mfem") + vendors("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 12e81d7b96..3a1e03cbbd 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 - conflicts("^metis", when="+metis") - conflicts("^parmetis", when="+metis") + vendors("metis", when="+metis") + vendors("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 aa5a5d0b3f..629c9eb0ad 100644 --- a/var/spack/repos/builtin/packages/votca/package.py +++ b/var/spack/repos/builtin/packages/votca/package.py @@ -28,9 +28,10 @@ class Votca(CMakePackage): "new-gmx", default=False, description="Build against gromacs>2019 - no tabulated kernels" ) variant("xtp", default=True, description="Build xtp parts of votca") - conflicts("votca-tools") - conflicts("votca-csg") - conflicts("votca-xtp") + + vendors("votca-tools") + vendors("votca-csg") + vendors("votca-xtp") depends_on("cmake@3.13:", type="build") depends_on("expat") |