From 1536691bc942d521bdd650c1096081e4dbfd15cd Mon Sep 17 00:00:00 2001 From: Tim Haines Date: Wed, 26 Aug 2020 20:51:00 -0500 Subject: [PATCH] caliper: Remove support for deprecated Dyninst versions (#18275) --- var/spack/repos/builtin/packages/caliper/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 3aca96fbe8d..9e4ddfca73d 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -56,7 +56,6 @@ class Caliper(CMakePackage): depends_on('adiak@0.1:0.99', when='@2.2: +adiak') - depends_on('dyninst@9.3.0:9.99', when='@:1.99 +dyninst') depends_on('dyninst@10.0:10.99', when='@2: +dyninst') depends_on('papi@5.3:5.99', when='@:2.2 +papi') @@ -76,6 +75,10 @@ class Caliper(CMakePackage): conflicts('+sosflow', '@2.0.0:2.4.99') conflicts('+adiak', '@:2.1.99') + # The Dyninst 9.X used by v1.9.X is deprecated + conflicts('+dyninst', when='@:1.99', + msg='Dyninst unsupported by version <=2.0.1') + def cmake_args(self): spec = self.spec