hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated protobuf and py-protobuf to version 3.6.1 (#9536)

Browse source 
* Updated protobuf and py-protobuf to version 3.6.1

also updated the download link as the repository has moved

* protobuf: modified conflict
This commit is contained in:
Leonhard Reichenbach 2018-11-15 16:59:04 +01:00 committed by Massimiliano Culpo
parent 2723db9f73
commit 2b64047e07
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
var/spack/repos/builtin/packages/protobuf/package.py
View file

@ -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')

1
var/spack/repos/builtin/packages/py-protobuf/package.py
View file

@ -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')