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.
This commit is contained in:
parent
45b4dcb9ed
commit
c23ffd89ff
3 changed files with 7 additions and 2 deletions
|
@ -689,7 +689,7 @@ def test_noversion_pkg(self, spec):
|
|||
|
||||
# Include targets to prevent regression on 20537
|
||||
@pytest.mark.parametrize('spec, best_achievable', [
|
||||
('mpileaks%gcc@4.4.7 target=x86_64:', 'core2'),
|
||||
('mpileaks%gcc@4.4.7 ^dyninst@10.2.1 target=x86_64:', 'core2'),
|
||||
('mpileaks%gcc@4.8 target=x86_64:', 'haswell'),
|
||||
('mpileaks%gcc@5.3.0 target=x86_64:', 'broadwell'),
|
||||
('mpileaks%apple-clang@5.1.0 target=x86_64:', 'x86_64')
|
||||
|
|
|
@ -37,7 +37,7 @@ bin/spack -h
|
|||
bin/spack help -a
|
||||
|
||||
# Profile and print top 20 lines for a simple call to spack spec
|
||||
spack -p --lines 20 spec mpileaks%gcc ^elfutils@0.170
|
||||
spack -p --lines 20 spec mpileaks%gcc ^dyninst@10.2.1 ^elfutils@0.170
|
||||
|
||||
#-----------------------------------------------------------
|
||||
# Run unit tests with code coverage
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue