From 4079bbce97950adfde394a276d710132af23f6e2 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 27 Mar 2021 22:22:11 +0100 Subject: Externals are preferred even when they have non-default variant values fixes #22596 Variants which are specified in an external spec are not scored negatively if they encode a non-default value. --- .../packages/external-non-default-variant/package.py | 13 +++++++++++++ .../trigger-external-non-default-variant/package.py | 12 ++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py create mode 100644 var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py new file mode 100644 index 0000000000..f5a4e0f07d --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/external-non-default-variant/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 ExternalNonDefaultVariant(Package): + """An external that is registered with a non-default value""" + homepage = "http://www.python.org" + url = "http://www.python.org/ftp/python/3.8.7/Python-3.8.7.tgz" + + version('3.8.7', 'be78e48cdfc1a7ad90efff146dce6cfe') + + variant('foo', default=True, description='just a variant') + variant('bar', default=True, description='just a variant') diff --git a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py new file mode 100644 index 0000000000..8b2b2be70d --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py @@ -0,0 +1,12 @@ +# 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 TriggerExternalNonDefaultVariant(Package): + """This ackage depends on an external with a non-default variant""" + homepage = "http://www.example.com" + url = "http://www.someurl.tar.gz" + + version('1.0', 'foobarbaz') + + depends_on('external-non-default-variant') -- cgit v1.2.3-70-g09d2