diff options
| -rw-r--r-- | lib/spack/spack/test/concretize.py | 2 | ||||
| -rwxr-xr-x | share/spack/qa/run-unit-tests | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/dyninst/package.py | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 28cf25fa78..db08a8a189 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -689,7 +689,7 @@ class TestConcretize(object): # 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') diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index 3bcfc6c400..418360ac37 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -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 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. |