diff options
author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-10-03 15:09:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-03 09:09:02 -0400 |
commit | b9e72557e8b52b63244500f226afda0efe798df2 (patch) | |
tree | 80521b68338eccca9bd6787315938e51011946a2 /var/spack/repos/builtin/packages/cmake | |
parent | 2de116d285f9853284b0e033d66a67bc0f3cdc2b (diff) | |
download | spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.gz spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.bz2 spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.xz spack-b9e72557e8b52b63244500f226afda0efe798df2.zip |
Remove .99 from version ranges (#26422)
In most cases, .99 can be omitted thanks to #26402 .
Diffstat (limited to 'var/spack/repos/builtin/packages/cmake')
-rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 9c1da9fb7e..bbb2f3fedd 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -167,15 +167,15 @@ class Cmake(Package): depends_on('xz', when='~ownlibs') depends_on('libarchive@3.1.0:', when='~ownlibs') depends_on('libarchive@3.3.3:', when='@3.15.0:~ownlibs') - depends_on('libuv@1.0.0:1.10.99', when='@3.7.0:3.10.3~ownlibs') - depends_on('libuv@1.10.0:1.10.99', when='@3.11.0:3.11.99~ownlibs') + depends_on('libuv@1.0.0:1.10', when='@3.7.0:3.10.3~ownlibs') + depends_on('libuv@1.10.0:1.10', when='@3.11.0:3.11~ownlibs') depends_on('libuv@1.10.0:', when='@3.12.0:~ownlibs') depends_on('rhash', when='@3.8.0:~ownlibs') depends_on('qt', when='+qt') depends_on('python@2.7.11:', when='+doc', type='build') depends_on('py-sphinx', when='+doc', type='build') depends_on('openssl', when='+openssl+ownlibs') - depends_on('openssl@:1.0.99', when='@:3.6.9+openssl+ownlibs') + depends_on('openssl@:1.0', when='@:3.6.9+openssl+ownlibs') depends_on('ncurses', when='+ncurses') # Cannot build with Intel, should be fixed in 3.6.2 @@ -201,14 +201,14 @@ class Cmake(Package): # Remove -A from the C++ flags we use when CXX_EXTENSIONS is OFF # Should be fixed in 3.19. # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5025 - patch('pgi-cxx-ansi.patch', when='@3.15:3.18.99') + patch('pgi-cxx-ansi.patch', when='@3.15:3.18') # Adds CCE v11+ fortran preprocessing definition. # requires Cmake 3.19+ # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5882 patch('5882-enable-cce-fortran-preprocessing.patch', sha256='b48396c0e4f61756248156b6cebe9bc0d7a22228639b47b5aa77c9330588ce88', - when='@3.19.0:3.19.99') + when='@3.19.0:3.19') conflicts('+qt', when='^qt@5.4.0') # qt-5.4.0 has broken CMake modules |