From 0f67b97065ae67bf138aed8e4bd04c765d58d3e1 Mon Sep 17 00:00:00 2001 From: Rémi Lacroix Date: Thu, 16 Jul 2020 01:57:19 +0200 Subject: Update icu4c package (#17461) * icu4c: Add new versions for older releases. The old URLs for versions 60.1, 58.2 and 57.1 do not work anymore so add the versions available on Github. The old versions are kept for reference (cf. #15896). * icu4c: Add versions 66.1 and 67.1. * icu4c: Fix compilation of versions 58 and 59 with recent glibc. --- var/spack/repos/builtin/packages/icu4c/package.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index 29307a4522..be5b4af3bc 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -14,10 +14,15 @@ class Icu4c(AutotoolsPackage): homepage = "http://site.icu-project.org/" url = "https://github.com/unicode-org/icu/releases/download/release-65-1/icu4c-65_1-src.tgz" + version('67.1', sha256='94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc') + version('66.1', sha256='52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e') version('65.1', sha256='53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948') version('64.1', sha256='92f1b7b9d51b396679c17f35a2112423361b8da3c1b9de00aa94fd768ae296e6') + version('60.3', sha256='476287b17db6e0b7da230dce4b58e8e5669b1510847f82cab3647920f1374390') version('60.1', sha256='f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225') + version('58.3', sha256='2680f3c547cd26cba1d7ebd819cd336ff92cf444a270e195fd3b10bfdf22276c') version('58.2', sha256='2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c') + version('57.2', sha256='623f04b921827a041f42d52495a6f8eee6565a9b7557051ac68e099123ff28dc') version('57.1', sha256='ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581') variant('cxxstd', @@ -31,15 +36,15 @@ class Icu4c(AutotoolsPackage): conflicts('%intel@:16', when='@60.1:', msg="Intel compilers have immature C++11 and multibyte support") + patch('https://github.com/unicode-org/icu/commit/ddfc30860354cbcb78c2c0bcf800be5ab44a9e4f.patch', + sha256='dfc501d78ddfabafe09dc1a7aa70f96b799164b18f6a57d616a9d48aaf989333', + level=2, when='@58.0:59.99') + configure_directory = 'source' def url_for_version(self, version): - if version >= Version('65'): - url = "https://github.com/unicode-org/icu/releases/download/release-{0}/icu4c-{1}-src.tgz" - return url.format(version.dashed, version.underscored) - else: - url = "http://download.icu-project.org/files/icu4c/{0}/icu4c-{1}-src.tgz" - return url.format(version.dotted, version.underscored) + url = "https://github.com/unicode-org/icu/releases/download/release-{0}/icu4c-{1}-src.tgz" + return url.format(version.dashed, version.underscored) def flag_handler(self, name, flags): if name == 'cxxflags': -- cgit v1.2.3-70-g09d2