From c9aeab58e6293be0c5e90f1267f9b64aac41e2e4 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson <17242663+blue42u@users.noreply.github.com> Date: Wed, 31 Jan 2024 01:27:05 -0600 Subject: [PATCH] hpctoolkit: refine dependencies (#42354) * Force Dyninst <=12 before @2024.01 * Remove some +pic requirements * Use virtual tbb dep --- .../repos/builtin/packages/hpctoolkit/package.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index ae76801941..bb170f38d4 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -155,22 +155,26 @@ class Hpctoolkit(AutotoolsPackage, MesonPackage): depends_on("binutils@:2.33.1 +libiberty~nls", type="link", when="@:2020.03") depends_on("boost" + boost_libs) depends_on("bzip2+shared", type="link") - depends_on("dyninst@12.1.0:", when="@2022.0:") - depends_on("dyninst@10.2.0:", when="@2021.0:2021.12") - depends_on("dyninst@9.3.2:", when="@:2020") + depends_on("dyninst@12.1.0:", when="@2024.01:") + depends_on("dyninst@12.1.0:12", when="@2022:2023.08") + depends_on("dyninst@10.2.0:12", when="@2021") + depends_on("dyninst@9.3.2:12", when="@:2020") depends_on("elfutils~nls", type="link") depends_on("gotcha@1.0.3:", when="@:2020.09") - depends_on("intel-tbb+shared") + depends_on("tbb") + depends_on("intel-tbb+shared", when="^[virtuals=tbb] intel-tbb") depends_on("libdwarf", when="@:2022.06") depends_on("libiberty+pic", when="@2022.10:") depends_on("libmonitor+hpctoolkit~dlopen", when="@2021.00:") depends_on("libmonitor+hpctoolkit+dlopen", when="@:2020") depends_on("libmonitor@2023.02.13:", when="@2023.01:") depends_on("libmonitor@2021.11.08:", when="@2022.01:") - depends_on("libunwind@1.4: +xz+pic") + depends_on("libunwind@1.4: +xz") + depends_on("libunwind +pic libs=static", when="@:2023.08") depends_on("mbedtls+pic", when="@:2022.03") depends_on("xerces-c transcoder=iconv") - depends_on("xz+pic libs=static", type="link") + depends_on("xz", type="link") + depends_on("xz+pic libs=static", type="link", when="@:2023.08") depends_on("yaml-cpp@0.7.0: +shared", when="@2022.10:") depends_on("zlib-api")