diff options
| author | Mark W. Krentel <krentel@rice.edu> | 2019-12-06 18:11:24 -0600 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-12-06 18:11:24 -0600 |
| commit | 9d9737f765416305dd2adbd816b447de5c5eae7c (patch) | |
| tree | 75ec7c14c4c59d62c98fbe655a30dc9630ecec7a | |
| parent | 01d35a4f3b81cf6985092aef5f1b05639cca5deb (diff) | |
| download | spack-9d9737f765416305dd2adbd816b447de5c5eae7c.tar.gz spack-9d9737f765416305dd2adbd816b447de5c5eae7c.tar.bz2 spack-9d9737f765416305dd2adbd816b447de5c5eae7c.tar.xz spack-9d9737f765416305dd2adbd816b447de5c5eae7c.zip | |
ibm-java: add version 8.0.6.0 (#14003)
* ibm-java: add version 8.0.6.0
Add version 8.0.6.0 and remove 8.0.5.30. IBM is fairly aggressive
about removing old versions, and 8.0.5.30 is no longer available from
their download site.
* Restore version 8.0.5.30, although it is no longer available for
download from IBM.
| -rw-r--r-- | var/spack/repos/builtin/packages/ibm-java/package.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/ibm-java/package.py b/var/spack/repos/builtin/packages/ibm-java/package.py index 81db3881b7..84def85aff 100644 --- a/var/spack/repos/builtin/packages/ibm-java/package.py +++ b/var/spack/repos/builtin/packages/ibm-java/package.py @@ -14,16 +14,23 @@ class IbmJava(Package): homepage = "https://developer.ibm.com/javasdk/" + # Note: IBM is fairly aggressive about taking down old versions, + # so we may need to update this frequently. Also, old revs may + # not be available for download. + + version_list = [ + ('8.0.6.0', 'ppc64', 'e142746a83e47ab91d71839d5776f112ed154ae180d0628e3f10886151dad710'), + ('8.0.6.0', 'ppc64le', '18c2eccf99225e6e7643141d8da4110cacc39f2fa00149fc26341d2272cc0102'), + ('8.0.5.30', 'ppc64', 'd39ce321bdadd2b2b829637cacf9c1c0d90235a83ff6e7dcfa7078faca2f212f'), + ('8.0.5.30', 'ppc64le', 'dec6434d926861366c135aac6234fc28b3e7685917015aa3a3089c06c3b3d8f0'), + ] + # There are separate tar files for big and little-endian machine - # types. When we add more versions, then turn this into a mapping - # from version and machine type to sha256sum. - mach = platform.machine() if platform.machine() == 'ppc64' else 'ppc64le' - if mach == 'ppc64le': - sha = 'dec6434d926861366c135aac6234fc28b3e7685917015aa3a3089c06c3b3d8f0' - else: - sha = 'd39ce321bdadd2b2b829637cacf9c1c0d90235a83ff6e7dcfa7078faca2f212f' + # types. And no, this won't work cross platform. - version('8.0.5.30', sha256=sha, expand=False) + for (ver, mach, sha) in version_list: + if mach == platform.machine(): + version(ver, sha256=sha, expand=False) provides('java@8') @@ -36,7 +43,7 @@ class IbmJava(Package): url = ('http://public.dhe.ibm.com/ibmdl/export/pub/systems/cloud' '/runtimes/java/{0}/linux/{1}/ibm-java-sdk-{2}-{1}' - '-archive.bin').format(version, self.mach, dash) + '-archive.bin').format(version, platform.machine(), dash) return url |