diff options
| author | Leonhard Reichenbach <Zehvogel@users.noreply.github.com> | 2018-11-15 16:59:04 +0100 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-11-15 16:59:04 +0100 |
| commit | 2b64047e07ccd8a0b97168603d406c97c5eea4f7 (patch) | |
| tree | 458903313ba0996773555aa6e8925929f173f75c | |
| parent | 2723db9f73e3a711336c92caf5506502073213c6 (diff) | |
| download | spack-2b64047e07ccd8a0b97168603d406c97c5eea4f7.tar.gz spack-2b64047e07ccd8a0b97168603d406c97c5eea4f7.tar.bz2 spack-2b64047e07ccd8a0b97168603d406c97c5eea4f7.tar.xz spack-2b64047e07ccd8a0b97168603d406c97c5eea4f7.zip | |
Updated protobuf and py-protobuf to version 3.6.1 (#9536)
* Updated protobuf and py-protobuf to version 3.6.1
also updated the download link as the repository has moved
* protobuf: modified conflict
| -rw-r--r-- | var/spack/repos/builtin/packages/protobuf/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-protobuf/package.py | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 62486aeb58..e62f551734 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -12,9 +12,10 @@ class Protobuf(CMakePackage): """Google's data interchange format.""" homepage = "https://developers.google.com/protocol-buffers" - url = "https://github.com/google/protobuf/archive/v3.2.0.tar.gz" + url = "https://github.com/protocolbuffers/protobuf/archive/v3.2.0.tar.gz" root_cmakelists_dir = "cmake" + version('3.6.1', sha256='3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b') version('3.5.2', 'ff6742018c172c66ecc627029ad54280') version('3.5.1.1', '5005003ae6b94773c4bbca87a644b131') version('3.5.1', '710f1a75983092c9b45ecef207236104') @@ -34,7 +35,8 @@ class Protobuf(CMakePackage): depends_on('zlib') - conflicts('%gcc@:4.6') # Requires c++11 + conflicts('%gcc@:4.6', when='@3.6.0:') # Requires c++11 + conflicts('%gcc@:4.6', when='@3.2.0:3.3.0') # Breaks # first fixed in 3.4.0: https://github.com/google/protobuf/pull/3406 patch('pkgconfig.patch', when='@:3.3.2') diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index 1b8e99ddfd..8a2f07197a 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -20,6 +20,7 @@ class PyProtobuf(PythonPackage): variant('cpp', default=False, description='Enable the cpp implementation') + version('3.6.1', sha256='1489b376b0f364bcc6f89519718c057eb191d7ad6f1b395ffd93d1aa45587811') version('3.5.2.post1', '3b60685732bd0cbdc802dfcb6071efbcf5d927ce3127c13c33ea1a8efae3aa76') version('3.5.2', '09879a295fd7234e523b62066223b128c5a8a88f682e3aff62fb115e4a0d8be0') version('3.5.1', '95b78959572de7d7fafa3acb718ed71f482932ddddddbd29ba8319c10639d863') |