From aa50c2c7d05ff8b42b22f814e593ae235235eb75 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Sat, 13 Jun 2020 09:01:42 -0500 Subject: hpctoolkit: add version 2020.06.12 (#17081) Add versions 2020.06.12 and develop. Switch default for variant papi to true. --- var/spack/repos/builtin/packages/hpctoolkit/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 0bc737eb82..9de2184d92 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -18,7 +18,9 @@ class Hpctoolkit(AutotoolsPackage): git = "https://github.com/HPCToolkit/hpctoolkit.git" maintainers = ['mwkrentel'] - version('master', branch='master') + version('develop', branch='develop') + version('master', branch='master') + version('2020.06.12', commit='ac6ae1156e77d35596fea743ed8ae768f7222f19') version('2020.03.01', commit='94ede4e6fa1e05e6f080be8dc388240ea027f769') version('2019.12.28', commit='b4e1877ff96069fd8ed0fdf0e36283a5b4b62240') version('2019.08.14', commit='6ea44ed3f93ede2d0a48937f288a2d41188a277c') @@ -44,7 +46,7 @@ class Hpctoolkit(AutotoolsPackage): # We can't build with both PAPI and perfmon for risk of segfault # from mismatched header files (unless PAPI installs the perfmon # headers). - variant('papi', default=False, + variant('papi', default=True, description='Use PAPI instead of perfmon for access to ' 'the hardware performance counters.') @@ -60,7 +62,7 @@ class Hpctoolkit(AutotoolsPackage): ' +graph +regex +shared +multithreaded visibility=global' ) - depends_on('binutils+libiberty~nls', type='link', when='@master') + depends_on('binutils+libiberty~nls', type='link', when='@2020.04.00:') depends_on('binutils@:2.33.1+libiberty~nls', type='link', when='@:2020.03.99') depends_on('boost' + boost_libs) depends_on('bzip2+shared', type='link') -- cgit v1.2.3-60-g2f50