From 52e0f47a3ff67bd0c8a31c6755b384dedd70ee02 Mon Sep 17 00:00:00 2001 From: Phil Tooley <32297355+ptooley@users.noreply.github.com> Date: Fri, 12 Jul 2019 16:30:07 +0100 Subject: [PATCH] update scalasca to latest version, simplify recipe (#11999) add list_url for use with spack checksum --- var/spack/repos/builtin/packages/scalasca/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py index cd088ccc82..c7d0278610 100644 --- a/var/spack/repos/builtin/packages/scalasca/package.py +++ b/var/spack/repos/builtin/packages/scalasca/package.py @@ -18,7 +18,9 @@ class Scalasca(AutotoolsPackage): homepage = "http://www.scalasca.org" url = "http://apps.fz-juelich.de/scalasca/releases/scalasca/2.1/dist/scalasca-2.1.tar.gz" + list_url = "https://scalasca.org/scalasca/front_content.php?idart=1072" + version('2.5', sha256='7dfa01e383bfb8a4fd3771c9ea98ff43772e415009d9f3c5f63b9e05f2dde0f6') version('2.4', '4a895868258030f700a635eac93d36764f60c8c63673c7db419ea4bcc6b0b760') version('2.3.1', 'a83ced912b9d2330004cb6b9cefa7585') version('2.2.2', '2bafce988b0522d18072f7771e491ab9') @@ -26,14 +28,16 @@ class Scalasca(AutotoolsPackage): depends_on("mpi") - # version 2.4 + # version 2.4+ depends_on('cubew@4.4:', when='@2.4:') + # version 2.3+ + depends_on('otf2@2:', when='@2.3:') + # version 2.3 depends_on('cube@4.3', when='@2.3:2.3.99') - depends_on('otf2@2:', when='@2.3:') - # version 2.1+ + # version 2.1 - 2.2 depends_on('cube@4.2', when='@2.1:2.2.999') depends_on('otf2@1.4', when='@2.1:2.2.999')