From a3de8eb8bb2159ff4e7bfb17cc5bb55a46a03aa9 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 4 Apr 2022 11:02:29 +0200 Subject: libuv: new versions, new url, drop autotools (#29846) --- var/spack/repos/builtin/packages/libuv/package.py | 40 +++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libuv/package.py b/var/spack/repos/builtin/packages/libuv/package.py index 487804fc0b..494fa78a48 100644 --- a/var/spack/repos/builtin/packages/libuv/package.py +++ b/var/spack/repos/builtin/packages/libuv/package.py @@ -5,22 +5,33 @@ class Libuv(AutotoolsPackage): """Multi-platform library with a focus on asynchronous IO""" homepage = "https://libuv.org" - url = "https://github.com/libuv/libuv/archive/v1.9.0.tar.gz" + url = "https://dist.libuv.org/dist/v1.44.1/libuv-v1.44.1-dist.tar.gz" - version('1.42.0', sha256='371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764') - version('1.41.1', sha256='62c29d1d76b0478dc8aaed0ed1f874324f6cd2d6ff4cb59a44026c09e818cd53') - version('1.41.0', sha256='6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa') - version('1.40.0', sha256='70fe1c9ba4f2c509e8166c0ca2351000237da573bb6c82092339207a9715ba6b') - version('1.39.0', sha256='dc7b21f1bb7ef19f4b42c5ea058afabe51132d165da18812b70fb319659ba629') - version('1.38.1', sha256='2177fca2426ac60c20f654323656e843dac4f568d46674544b78f416697bd32c') - version('1.25.0', sha256='ce3036d444c3fb4f9a9e2994bec1f4fa07872b01456998b422ce918fdc55c254') - version('1.10.0', sha256='50f4ed57d65af4ab634e2cbdd90c49213020e15b4d77d3631feb633cbba9239f') - version('1.9.0', sha256='f8b8272a0d80138b709d38fad2baf771899eed61e7f9578d17898b07a1a2a5eb') + version('1.44.1', sha256='b7293cefb470e17774dcf5d62c4c969636172726155b55ceef5092b7554863cc') + version('1.44.0', sha256='6c52494401cfe8d08fb4ec245882f0bd4b1572b5a8e79d6c418b855422a1a27d') + version('1.43.0', sha256='90d72bb7ae18de2519d0cac70eb89c319351146b90cd3f91303a492707e693a4') + version('1.42.0', sha256='43129625155a8aed796ebe90b8d4c990a73985ec717de2b2d5d3a23cfe4deb72') + version('1.41.1', sha256='65db0c7f2438bc8cd48865de282bf6670027f3557d6e3cb62fb65b2e350a687d') + version('1.41.0', sha256='1184533907e1ddad9c0dcd30a5abb0fe25288c287ff7fee303fff7b9b2d6eb6e') + version('1.40.0', sha256='61a90db95bac00adec1cc5ddc767ebbcaabc70242bd1134a7a6b1fb1d498a194') + version('1.39.0', sha256='5c52de5bdcfb322dbe10f98feb56e45162e668ad08bc28ab4b914d4f79911697') + version('1.38.1', sha256='0ece7d279e480fa386b066130a562ad1a622079d43d1c30731f2f66cd3f5c647') + version('1.25.0', sha256='0e927ddc0f1c83899000a63e9286cac5958222f8fb5870a49b0c81804944a912') + version('1.10.0', sha256='0307a0eec6caddd476f9cad39e18fdd6f22a08aa58103c4b0aead96d638be15e') + version('1.9.0', sha256='d595b2725abcce851c76239aab038adc126c58714cfb572b2ebb2d21b3593842') - depends_on('automake', type='build') - depends_on('autoconf', type='build') - depends_on('libtool', type='build') - depends_on('m4', type='build') + def url_for_version(self, version): + if version < Version('1.44.0'): + url = "https://dist.libuv.org/dist/v{0}/libuv-v{0}.tar.gz" + else: + # From 1.44 on, the `-dist` download includes a configure script + url = "https://dist.libuv.org/dist/v{0}/libuv-v{0}-dist.tar.gz" + return url.format(version, version) + + depends_on('automake', type='build', when='@:1.43.0') + depends_on('autoconf', type='build', when='@:1.43.0') + depends_on('libtool', type='build', when='@:1.43.0') + depends_on('m4', type='build', when='@:1.43.0') # Tries to build an Objective-C file with GCC's C frontend # https://github.com/libuv/libuv/issues/2805 @@ -28,6 +39,7 @@ class Libuv(AutotoolsPackage): msg='libuv does not compile with GCC on macOS yet, use clang. ' 'See: https://github.com/libuv/libuv/issues/2805') + @when('@:1.43') def autoreconf(self, spec, prefix): # This is needed because autogen.sh generates on-the-fly # an m4 macro needed during configuration -- cgit v1.2.3-60-g2f50