diff options
| author | Greg Becker <becker33@llnl.gov> | 2020-06-25 12:34:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 12:34:09 -0500 |
| commit | 096bd69a949225590feeaeaf16545d673c4cee6d (patch) | |
| tree | 27bfb6caf1f1d19c7dd3ac5431b39284312d81bd /var | |
| parent | f936e3a1dbc43629e01a3a7e2cc1682419cb381b (diff) | |
| download | spack-096bd69a949225590feeaeaf16545d673c4cee6d.tar.gz spack-096bd69a949225590feeaeaf16545d673c4cee6d.tar.bz2 spack-096bd69a949225590feeaeaf16545d673c4cee6d.tar.xz spack-096bd69a949225590feeaeaf16545d673c4cee6d.zip | |
prevent multiple version sigils in the same spec (#17246)
* prevent multiple version sigils in the same spec
* fix packages with malformed versions
Diffstat (limited to 'var')
4 files changed, 7 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index 75993c4701..26fe53190a 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -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): diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 82d2d05d75..1cbd94b314 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -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:') diff --git a/var/spack/repos/builtin/packages/py-oauthlib/package.py b/var/spack/repos/builtin/packages/py-oauthlib/package.py index 163db071ad..93fbb9aacc 100644 --- a/var/spack/repos/builtin/packages/py-oauthlib/package.py +++ b/var/spack/repos/builtin/packages/py-oauthlib/package.py @@ -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')) diff --git a/var/spack/repos/builtin/packages/xeus/package.py b/var/spack/repos/builtin/packages/xeus/package.py index 629bbb76a8..756a130aa4 100644 --- a/var/spack/repos/builtin/packages/xeus/package.py +++ b/var/spack/repos/builtin/packages/xeus/package.py @@ -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') |