From 84f4e86358d58b4adc36a0e017f7217f2d2058e4 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 12 Oct 2018 18:51:52 +0200 Subject: Update scorep and friends (#9495) - cube: Add 4.4.2, add conflicts for ~gui, build 4.4 from cubegui tar - cubelib: Add 4.4.2 - cubew: Add 4.4.1 - opari2: Add 2.0.4 - scorep: Add 4.1 --- var/spack/repos/builtin/packages/cube/package.py | 20 +++++++++++++------- var/spack/repos/builtin/packages/cubelib/package.py | 8 +++++++- var/spack/repos/builtin/packages/cubew/package.py | 8 +++++++- var/spack/repos/builtin/packages/opari2/package.py | 1 + var/spack/repos/builtin/packages/scorep/package.py | 1 + 5 files changed, 29 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 89bdcd873b..ad528e6806 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -34,31 +34,37 @@ class Cube(AutotoolsPackage): """ homepage = "http://www.scalasca.org/software/cube-4.x/download.html" - url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/CubeBundle-4.4.tar.gz" + url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubegui-4.4.2.tar.gz" - version('4.4', 'f4f0544883bdd5bad9e11a4a692858bf') + version('4.4.2', '29b6479616a524f8325f5031a883963bf965fb92569de33271a020f08650ec7b') + version('4.4', '0620bae3ac357d0486ce7f5f97e448eeb2494c9a31865b679380ee08c6750e70') version('4.3.5', 'e5dce986e3c6381ea3a5fcb66c553adc') version('4.3.4', '50f73060f55311cb12c5b3cb354d59fa') version('4.3.3', '07e109248ed8ffc7bdcce614264a2909') - version('4.2.3', '8f95b9531f5a8f8134f279c2767c9b20') - variant('gui', default=False, description='Build CUBE GUI') + variant('gui', default=True, description='Build Cube GUI') patch('qt-version.patch', when='@4.3.0:4.3.999 +gui') + depends_on('cubelib', when='@4.4:') + + depends_on('pkgconfig', type='build') + depends_on('dbus') depends_on('zlib') depends_on('qt@5:', when='@4.3.0: +gui') depends_on('qt@4.8:', when='@4.2.0:4.2.999 +gui') + conflicts('~gui', when='@4.4:') + def url_for_version(self, version): if version >= Version('4.4'): - filename = 'CubeBundle-{0}.tar.gz'.format(version) + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubegui-{1}.tar.gz' else: - filename = 'cube-{0}.tar.gz'.format(version) + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cube-{1}.tar.gz' - return 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/{1}'.format(version.up_to(2), filename) + return url.format(version.up_to(2), version) def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py index 5a6a7844b7..de1769e7dc 100644 --- a/var/spack/repos/builtin/packages/cubelib/package.py +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -31,10 +31,16 @@ class Cubelib(AutotoolsPackage): homepage = "http://www.scalasca.org/software/cube-4.x/download.html" url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubelib-4.4.tar.gz" - version('4.4', 'c903f3c44d3228ebefd00c831966988e') + version('4.4.2', '843335c7d238493f1b4cb8e07555ccfe99a3fa521bf162e9d8eaa6733aa1f949') + version('4.4', 'c903f3c44d3228ebefd00c831966988e') depends_on('zlib') + def url_for_version(self, version): + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubelib-{1}.tar.gz' + + return url.format(version.up_to(2), version) + def configure_args(self): configure_args = ['--enable-shared'] diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py index 79d7c0617c..3fcc101ace 100644 --- a/var/spack/repos/builtin/packages/cubew/package.py +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -31,10 +31,16 @@ class Cubew(AutotoolsPackage): homepage = "http://www.scalasca.org/software/cube-4.x/download.html" url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubew-4.4.tar.gz" - version('4.4', 'e9beb140719c2ad3d971e1efb99e0916') + version('4.4.1', 'c09e3f5a3533ebedee2cc7dfaacd7bac4680c14c3fa540669466583a23f04b67') + version('4.4', 'e9beb140719c2ad3d971e1efb99e0916') depends_on('zlib') + def url_for_version(self, version): + url = 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cubew-{1}.tar.gz' + + return url.format(version.up_to(2), version) + def configure_args(self): configure_args = ['--enable-shared'] diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py index 2f1b89bd98..cd3f5acd79 100644 --- a/var/spack/repos/builtin/packages/opari2/package.py +++ b/var/spack/repos/builtin/packages/opari2/package.py @@ -39,6 +39,7 @@ class Opari2(AutotoolsPackage): homepage = "http://www.vi-hps.org/projects/score-p" url = "http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.2.tar.gz" + version('2.0.4', 'f69e324792f66780b473daf2b3c81f58ee8188adc72b6fe0dacf43d4c1a0a131') version('2.0.3', 'f34674718ffdb098a48732a1eb9c1aa2') version('2.0.1', '74af78f1f27b8caaa4271e0b97fb0fba') version('2.0', '72350dbdb6139f2e68a5055a4f0ba16c') diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 715006255c..b794f83f7a 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -34,6 +34,7 @@ class Scorep(AutotoolsPackage): homepage = "http://www.vi-hps.org/projects/score-p" url = "http://www.vi-hps.org/upload/packages/scorep/scorep-2.0.2.tar.gz" + version('4.1', '7bb6c1eecdd699b4a3207caf202866778ee01f15ff39a9ec198fcd872578fe63') version('4.0', 'f04478e0407d67eeb8c49c3c51d91e12') version('3.1', '065bf8eb08398e8146c895718ddb9145') version('3.0', '44da8beaa3f71436a5f6fe51938aab2f') -- cgit v1.2.3-60-g2f50