summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/hpctoolkit-externals/package.py7
-rw-r--r--var/spack/repos/builtin/packages/hpctoolkit/package.py9
2 files changed, 8 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
index 95e42f981d..136df2a208 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit-externals/package.py
@@ -30,11 +30,10 @@ class HpctoolkitExternals(Package):
HpctoolkitExternals package provides all these prerequisites."""
homepage = "http://hpctoolkit.org"
+ url = "https://github.com/HPCToolkit/hpctoolkit-externals"
- # Note: No precise release tags/branches provided
- version('5.4',
- git='https://github.com/HPCToolkit/hpctoolkit-externals.git',
- commit='3d2953623357bb06e9a4b51eca90a4b039c2710e')
+ version('2017.06', git=url, tag='release-2017.06')
+ version('master', git=url)
parallel = False
diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py
index d2fc86a7fb..7b56e57a4e 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py
@@ -34,17 +34,18 @@ class Hpctoolkit(Package):
and attributes them to the full calling context in which they occur."""
homepage = "http://hpctoolkit.org"
+ url = "https://github.com/HPCToolkit/hpctoolkit"
- # Note: No precise release tags/branches provided
- version('5.4', git='https://github.com/HPCToolkit/hpctoolkit.git',
- commit='d9ca2112762e5a06ea31b5295d793e4a83272d19')
+ version('2017.06', git=url, tag='release-2017.06')
+ version('master', git=url)
variant('mpi', default=True, description='Enable MPI supoort')
variant('papi', default=True, description='Enable PAPI counter support')
- depends_on('hpctoolkit-externals')
depends_on('papi', when='+papi')
depends_on('mpi', when='+mpi')
+ depends_on('hpctoolkit-externals@2017.06', when='@2017.06')
+ depends_on('hpctoolkit-externals@master', when='@master')
def install(self, spec, prefix):