diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/caffe/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/protobuf/package.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py index 24bbe1ec6a..5d83b8e1a7 100644 --- a/var/spack/repos/builtin/packages/caffe/package.py +++ b/var/spack/repos/builtin/packages/caffe/package.py @@ -31,9 +31,13 @@ class Caffe(CMakePackage): Center (BVLC) and by community contributors.""" homepage = "http://caffe.berkeleyvision.org" - url = "https://github.com/BVLC/caffe/archive/rc5.tar.gz" + url = "https://github.com/BVLC/caffe/archive/1.0.tar.gz" + version('1.0', '5fbb0e32e7cd8de3de46e6fe6e4cd2b5') version('rc5', '692bd3580b7576485cde6b1e03eb5a6d') + version('rc4', 'd86eeb38b1400097d32ffcabdec75b55') + version('rc3', '84e39223115753b48312a8bf48c31f59') + version('rc2', 'c331932e34b5e2f5022fcc34c419080f') variant('gpu', default=False, description='Builds with support for GPUs via CUDA and cuDNN') diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 14eaf3739e..0a073b837a 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -41,6 +41,8 @@ class Protobuf(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') + conflicts('%gcc@:4.6') # Requires c++11 + variant('shared', default=True, description='Build shared libraries.') def configure_args(self): |