From eded8f48dc629a5f3a72acf9c134731f8b89606c Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 14 Oct 2021 23:06:41 +0200 Subject: ASP-based solver: add a rule for version uniqueness in virtual packages (#26740) fixes #26718 A virtual package may or may not have a version, but it never has more than one. Previously we were missing a rule for that. --- .../repos/builtin.mock/packages/hpcviewer/package.py | 13 +++++++++++++ .../packages/virtual-with-versions/package.py | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 var/spack/repos/builtin.mock/packages/hpcviewer/package.py create mode 100644 var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py new file mode 100644 index 0000000000..2015e6a294 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py @@ -0,0 +1,13 @@ +# Copyright 2013-2021 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) +class Hpcviewer(AutotoolsPackage): + """Uses version-test-pkg, as a build dependency""" + homepage = "http://www.spack.org" + url = "http://www.spack.org/downloads/aml-1.0.tar.gz" + + version('2019.02', '0123456789abcdef0123456789abcdef') + + depends_on('java@11:', type=('build', 'run'), when='@2021.0:') + depends_on('java@8', type=('build', 'run'), when='@:2020') diff --git a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py new file mode 100644 index 0000000000..9b0e9271da --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2021 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) +class VirtualWithVersions(AutotoolsPackage): + """Uses version-test-pkg, as a build dependency""" + homepage = "http://www.spack.org" + url = "http://www.spack.org/downloads/aml-1.0.tar.gz" + + version('17.0.1', '0123456789abcdef0123456789abcdef') + version('16.0.1', '0123456789abcdef0123456789abcdef') + version('11.0.1', '0123456789abcdef0123456789abcdef') + version('1.8.0', '0123456789abcdef0123456789abcdef') + + provides('java@17', when='@17.0:17.9') + provides('java@16', when='@16.0:16.9') + provides('java@11', when='@11.0:11.9') + provides('java@10', when='@10.0:10.9') + provides('java@9', when='@9.0:9.9') + provides('java@8', when='@1.8.0:1.8.9') -- cgit v1.2.3-70-g09d2