diff options
| author | mcneish1 <35310375+mcneish1@users.noreply.github.com> | 2018-05-09 18:52:39 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-09 20:52:39 -0500 |
| commit | cadf9242ba6a5385055775a28bc1bf05c15230fa (patch) | |
| tree | 0c40c66d5a6a569610c31e523a28ffb4b0545bfd /var | |
| parent | ef731cc5115d8336881cf19576362f772921d3c8 (diff) | |
| download | spack-cadf9242ba6a5385055775a28bc1bf05c15230fa.tar.gz spack-cadf9242ba6a5385055775a28bc1bf05c15230fa.tar.bz2 spack-cadf9242ba6a5385055775a28bc1bf05c15230fa.tar.xz spack-cadf9242ba6a5385055775a28bc1bf05c15230fa.zip | |
Add 3.5.2; Add optional cpp implementation enable for py-protobuf (#8069)
* Add 3.5.2; Add optional cpp implementation enable for py-protobuf
* Make flake8 happy
* Give all required install_args
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/protobuf/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-protobuf/package.py | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index ec60a0e6d4..a430ff2f11 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -34,6 +34,7 @@ class Protobuf(CMakePackage): url = "https://github.com/google/protobuf/archive/v3.2.0.tar.gz" root_cmakelists_dir = "cmake" + version('3.5.2', 'ff6742018c172c66ecc627029ad54280') version('3.5.1.1', '5005003ae6b94773c4bbca87a644b131') version('3.5.1', '710f1a75983092c9b45ecef207236104') version('3.5.0.1', 'b3ed2401acf167207277b254fd7f9638') diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index 7cf2dad7f2..9353cc5925 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -36,6 +36,12 @@ class PyProtobuf(PythonPackage): homepage = 'https://developers.google.com/protocol-buffers/' url = 'https://pypi.io/packages/source/p/protobuf/protobuf-3.0.0b2.tar.gz' + variant('cpp', default=False, + description='Enable the cpp implementation') + + version('3.5.2.post1', '3b60685732bd0cbdc802dfcb6071efbcf5d927ce3127c13c33ea1a8efae3aa76') + version('3.5.2', '09879a295fd7234e523b62066223b128c5a8a88f682e3aff62fb115e4a0d8be0') + version('3.5.1', '95b78959572de7d7fafa3acb718ed71f482932ddddddbd29ba8319c10639d863') version('3.0.0b2', 'f0d3bd2394345a9af4a277cd0302ae83') version('2.6.1', '6bf843912193f70073db7f22e2ea55e2') version('2.5.0', '338813f3629d59e9579fed9035ecd457') @@ -43,3 +49,13 @@ class PyProtobuf(PythonPackage): version('2.3.0', 'bb020c962f252fe81bfda8fb433bafdd') depends_on('py-setuptools', type='build') + depends_on('protobuf', when='+cpp') + + @when('+cpp') + def build_args(self, spec, prefix): + return ['--cpp_implementation'] + + @when('+cpp') + def install_args(self, spec, prefix): + args = super(PyProtobuf, self).install_args(spec, prefix) + return args + ['--cpp_implementation'] |