From 42633e34ab0f7db7df5dc79aabfa63df31dd47a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=A5=E7=BE=8E=E7=8C=9E=E7=8C=81?= Date: Fri, 8 Mar 2019 02:42:24 +0800 Subject: [PATCH] CMake package: update libuv dependency constraints (#10824) * Add libuv version 1.10.0 * CMake versions before 3.12.0 do not build with libuv version 1.25.0, so a constraint is added to build earlier versions of CMake with libuv version 1.10.x --- var/spack/repos/builtin/packages/cmake/package.py | 5 +++-- var/spack/repos/builtin/packages/libuv/package.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index d93713758e2..828765bd9e9 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -69,8 +69,9 @@ class Cmake(Package): depends_on('bzip2', when='~ownlibs') depends_on('xz', when='~ownlibs') depends_on('libarchive', when='~ownlibs') - depends_on('libuv@1.0.0:', when='@3.7.0:3.10.3~ownlibs') - depends_on('libuv@1.10.0:', when='@3.11.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.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') diff --git a/var/spack/repos/builtin/packages/libuv/package.py b/var/spack/repos/builtin/packages/libuv/package.py index 29c1b0f1cb0..61e9da43391 100644 --- a/var/spack/repos/builtin/packages/libuv/package.py +++ b/var/spack/repos/builtin/packages/libuv/package.py @@ -12,6 +12,7 @@ class Libuv(AutotoolsPackage): url = "https://github.com/libuv/libuv/archive/v1.9.0.tar.gz" version('1.25.0', '31a1873ebceacae42573bac8ec5da687') + version('1.10.0', 'f7a12f3a8ee021c20cfbc9af4cc5b793') version('1.9.0', '14737f9c76123a19a290dabb7d1cd04c') depends_on('automake', type='build')