diff options
| author | Mark W. Krentel <krentel@rice.edu> | 2020-03-18 22:19:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 22:19:25 -0500 |
| commit | 69231c7d189239df9874b4a4273acf16d64a3dc1 (patch) | |
| tree | a3f5646253e28a74562f539b30569ffd77161946 | |
| parent | 7bcc41018ff792a26e70f44b4b77722d5d9f042f (diff) | |
| download | spack-69231c7d189239df9874b4a4273acf16d64a3dc1.tar.gz spack-69231c7d189239df9874b4a4273acf16d64a3dc1.tar.bz2 spack-69231c7d189239df9874b4a4273acf16d64a3dc1.tar.xz spack-69231c7d189239df9874b4a4273acf16d64a3dc1.zip | |
hpctoolkit: restore binutils 2.34 for master (#15556)
Hpctoolkit master was recently updated to test for and allow old
binutils <= 2.33.1 and/or new binutils 2.34. Older hpctoolkit up to
2030.03.01 will forever require :2.33.1.
Adjust the libunwind dependency for safety with the current
concretizer.
| -rw-r--r-- | var/spack/repos/builtin/packages/hpctoolkit/package.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index a8c489f87d..d64ce78fad 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -60,15 +60,16 @@ class Hpctoolkit(AutotoolsPackage): ' +graph +regex +shared +multithreaded visibility=global' ) - depends_on('binutils@:2.33.1+libiberty~nls', type='link') + depends_on('binutils+libiberty~nls', type='link', when='@master') + 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') depends_on('dyninst@9.3.2:') depends_on('elfutils+bzip2+xz~nls', type='link') depends_on('intel-tbb+shared') depends_on('libdwarf') - depends_on('libmonitor+hpctoolkit') - depends_on('libmonitor+bgq', when='+bgq') + depends_on('libmonitor+hpctoolkit+bgq', when='+bgq') + depends_on('libmonitor+hpctoolkit~bgq', when='~bgq') depends_on('libunwind@1.4: +xz') depends_on('mbedtls+pic') depends_on('xerces-c transcoder=iconv') |