From 94971d519c495fc134e60078f7904c424ff77aa8 Mon Sep 17 00:00:00 2001 From: albestro <9337627+albestro@users.noreply.github.com> Date: Mon, 3 Feb 2020 17:26:38 +0100 Subject: Fix CMake and update libarchive (#14684) * update libarchive and fix version of libarchive cmake dependency * (at least) libarchive 3.3.3 dependency from cmake 3.15.0 * cmake depends on libarchive 3.1.0 if not specified differently currently it is applied to cmake <3.15.0 Co-Authored-By: Adam J. Stewart Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/cmake/package.py | 3 ++- var/spack/repos/builtin/packages/libarchive/package.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 5e4b644e5b..4f6e30874b 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -101,7 +101,8 @@ class Cmake(Package): depends_on('zlib', when='~ownlibs') depends_on('bzip2', when='~ownlibs') depends_on('xz', when='~ownlibs') - depends_on('libarchive', 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.10.0:', when='@3.12.0:~ownlibs') diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index 9449a48140..1e0a09c959 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -13,6 +13,7 @@ class Libarchive(AutotoolsPackage): homepage = "http://www.libarchive.org" url = "http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz" + version('3.4.1', sha256='fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191') version('3.3.2', sha256='ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce') version('3.2.1', sha256='72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2') version('3.1.2', sha256='eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e') -- cgit v1.2.3-60-g2f50