zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent multiple version sigils in the same spec (#17246)

Browse Source 
* prevent multiple version sigils in the same spec

* fix packages with malformed versions
This commit is contained in:
Greg Becker
2020-06-25 12:34:09 -05:00
committed by GitHub
parent f936e3a1db
commit 096bd69a94
7 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/netlib-scalapack/package.py
View File

@@ -41,11 +41,11 @@ class NetlibScalapack(CMakePackage):
depends_on('cmake', when='@2.0.0:', type='build')
# See: https://github.com/Reference-ScaLAPACK/scalapack/issues/9
patch("cmake_fortran_mangle.patch", when='@2.0.2:@2.0.99')
patch("cmake_fortran_mangle.patch", when='@2.0.2:2.0.99')
# See: https://github.com/Reference-ScaLAPACK/scalapack/pull/10
patch("mpi2-compatibility.patch", when='@2.0.2:@2.0.99')
patch("mpi2-compatibility.patch", when='@2.0.2:2.0.99')
# See: https://github.com/Reference-ScaLAPACK/scalapack/pull/16
patch("int_overflow.patch", when='@2.0.0:@2.1.0')
patch("int_overflow.patch", when='@2.0.0:2.1.0')
@property
def libs(self):

4
var/spack/repos/builtin/packages/protobuf/package.py
View File

@@ -56,10 +56,10 @@ class Protobuf(Package):
# first fixed in 3.4.0: https://github.com/google/protobuf/pull/3406
patch('pkgconfig.patch', when='@3.0.2:3.3.2')
patch('intel-v1.patch', when='@3.2:@3.6 %intel')
patch('intel-v1.patch', when='@3.2:3.6 %intel')
# See https://github.com/protocolbuffers/protobuf/pull/7197
patch('intel-v2.patch', when='@3.7:@3.11.4 %intel')
patch('intel-v2.patch', when='@3.7:3.11.4 %intel')
patch('protoc2.5.0_aarch64.patch', sha256='7b44fcdb794f421174d619f83584e00a36012a16da09079e2fad9c12f7337451', when='@2.5.0 target=aarch64:')

2
var/spack/repos/builtin/packages/py-oauthlib/package.py
View File

@@ -32,6 +32,6 @@ class PyOauthlib(PythonPackage):
depends_on('py-pytest-cov@2.6:', type='test')
depends_on('py-nose', type='test', when='@2.0.2')
depends_on('py-unittest2', type='test', when='^python@2 @2.0.2')
depends_on('py-unittest2', type='test', when='^python@2.0.2')
depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))

2
var/spack/repos/builtin/packages/xeus/package.py
View File

@@ -27,7 +27,7 @@ class Xeus(CMakePackage):
depends_on('cppzmq@4.3.0:')
depends_on('cryptopp@7.0.0:')
depends_on('xtl@0.4.0:')
depends_on('nlohmann-json@3.2.0', when='@develop@0.15.0:')
depends_on('nlohmann-json@3.2.0', when='@develop,0.15.0:')
depends_on('nlohmann-json@3.1.1', when='@0.14.1')
depends_on('libuuid')