diff options
| author | Andrew W Elble <aweits@rit.edu> | 2020-12-03 10:28:34 -0500 |
|---|---|---|
| committer | Tamara Dahlgren <dahlgren1@llnl.gov> | 2021-02-17 17:07:21 -0800 |
| commit | 92de48422822a6ee2be94551fa604e4b75dab99f (patch) | |
| tree | e76258f7e582d7dc4552de4de0e3efa0ae1d11de /var | |
| parent | b78cc5b43d5fe6c4c477f00d7a524fdb7d480951 (diff) | |
| download | spack-92de48422822a6ee2be94551fa604e4b75dab99f.tar.gz spack-92de48422822a6ee2be94551fa604e4b75dab99f.tar.bz2 spack-92de48422822a6ee2be94551fa604e4b75dab99f.tar.xz spack-92de48422822a6ee2be94551fa604e4b75dab99f.zip | |
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)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py | 16 | ||||
| -rw-r--r-- | var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/uuid.patch | 1 |
2 files changed, 17 insertions, 0 deletions
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 |