diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-10 19:00:07 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-10 19:28:47 -0700 |
| commit | ef9deeccd173f29c28392ff0a0030ff48260b8a0 (patch) | |
| tree | 791be7268a9e5b0c5af0a4c4eb2484844fbcdbd9 /var | |
| parent | 09fff399904efe1f02b7142c5d9abfccd67b8f1b (diff) | |
| parent | 13ff1a9bf60dff03edadefa0c411600b210ca989 (diff) | |
| download | spack-ef9deeccd173f29c28392ff0a0030ff48260b8a0.tar.gz spack-ef9deeccd173f29c28392ff0a0030ff48260b8a0.tar.bz2 spack-ef9deeccd173f29c28392ff0a0030ff48260b8a0.tar.xz spack-ef9deeccd173f29c28392ff0a0030ff48260b8a0.zip | |
Merge branch 'features/yaml-spec' into features/optional-deps
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/mock_packages/mpileaks/package.py | 3 | ||||
| -rw-r--r-- | var/spack/packages/python/package.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/mock_packages/mpileaks/package.py b/var/spack/mock_packages/mpileaks/package.py index c6be37bc13..3989f1b452 100644 --- a/var/spack/mock_packages/mpileaks/package.py +++ b/var/spack/mock_packages/mpileaks/package.py @@ -33,6 +33,9 @@ class Mpileaks(Package): version(2.2, 'foobarbaz') version(2.3, 'foobarbaz') + variant('debug', default=False, description='Debug variant') + variant('opt', default=False, description='Optimized variant') + depends_on("mpi") depends_on("callpath") diff --git a/var/spack/packages/python/package.py b/var/spack/packages/python/package.py index 31a12ea653..797900527d 100644 --- a/var/spack/packages/python/package.py +++ b/var/spack/packages/python/package.py @@ -139,7 +139,9 @@ class Python(Package): def activate(self, ext_pkg, **args): - args.update(ignore=self.python_ignore(ext_pkg, args)) + ignore=self.python_ignore(ext_pkg, args) + args.update(ignore=ignore) + super(Python, self).activate(ext_pkg, **args) exts = spack.install_layout.extension_map(self.spec) |