summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTim Haines <thaines.astro@gmail.com>2021-04-26 15:53:53 -0500
committerGitHub <noreply@github.com>2021-04-26 13:53:53 -0700
commitc23ffd89ffadd211a727bb0866159b81fd3f6c82 (patch)
tree80cf317bf1e13dd29a344c93c67648e1c2b76ff6 /var
parent45b4dcb9ed6ce8cc5d5ca6275bca4ef07c3e82fc (diff)
downloadspack-c23ffd89ffadd211a727bb0866159b81fd3f6c82.tar.gz
spack-c23ffd89ffadd211a727bb0866159b81fd3f6c82.tar.bz2
spack-c23ffd89ffadd211a727bb0866159b81fd3f6c82.tar.xz
spack-c23ffd89ffadd211a727bb0866159b81fd3f6c82.zip
Dyninst: Add dependencies for v11.0.0 (#23121)
Also update the mpileaks unit test to avoid a conflict on CentOS 6 where Dyninst >=11.0.0 no longer builds due to a compiler version conflict.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/dyninst/package.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py
index 4698d27b97..215003ebf2 100644
--- a/var/spack/repos/builtin/packages/dyninst/package.py
+++ b/var/spack/repos/builtin/packages/dyninst/package.py
@@ -41,6 +41,8 @@ class Dyninst(CMakePackage):
depends_on('boost@1.61.0:' + boost_libs, when='@10.1.0:')
depends_on('boost@1.61.0:1.69.99' + boost_libs, when='@:10.0.99')
+ depends_on('boost@1.67.0:' + boost_libs, when='@11.0.0:')
+
depends_on('libiberty+pic')
# Dyninst uses elfutils starting with 9.3.0, and used libelf
@@ -76,6 +78,9 @@ class Dyninst(CMakePackage):
conflicts('%xl')
conflicts('%xl_r')
+ # Version 11.0 requires a C++11-compliant ABI
+ conflicts('%gcc@:5.99.99', when='@11.0.0:')
+
# Versions 9.3.x used cotire, but have no knob to turn it off.
# Cotire has no real use for one-time builds and can break
# parallel builds with both static and shared libs.