From 09aae616c760a3abb782aa3353c3476851b6a590 Mon Sep 17 00:00:00 2001 From: Andrew W Elble Date: Thu, 3 Dec 2020 10:28:34 -0500 Subject: concretizer: call inject_patches_variants() on the roots of the specs (#20203) As was done in the old concretizer. Fixes an issue where conditionally patched dependencies did not show up in spec (gdal+jasper) --- .../packages/conditionally-patch-dependency/package.py | 16 ++++++++++++++++ .../packages/conditionally-patch-dependency/uuid.patch | 1 + 2 files changed, 17 insertions(+) create mode 100644 var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py create mode 100644 var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/uuid.patch (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py new file mode 100644 index 0000000000..7321d5bbd4 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py @@ -0,0 +1,16 @@ +# Copyright 2013-2020 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 ConditionallyPatchDependency(Package): + """Package that conditionally requries a patched version + of a dependency.""" + + homepage = "http://www.example.com" + url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" + + version('1.0', '0123456789abcdef0123456789abcdef') + variant('jasper', default=False) + depends_on('libelf@0.8.10', patches=[patch('uuid.patch')], when='+jasper') diff --git a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/uuid.patch b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/uuid.patch new file mode 100644 index 0000000000..bc9de1f3a4 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/uuid.patch @@ -0,0 +1 @@ +patchadep -- cgit v1.2.3-60-g2f50