From 1a6467c4859ca23cee7d9b236cd96d475b82fe00 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 16 Nov 2024 09:44:23 +0100 Subject: [PATCH] dyninst: add missing dependencies --- var/spack/repos/builtin/packages/dyninst/package.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index cca8a3026eb..d1af8f5b9d9 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -95,8 +95,8 @@ class Dyninst(CMakePackage): conflicts("^intel-oneapi-tbb@2021.1:") conflicts("^intel-parallel-studio") - depends_on("intel-tbb@2019.9:", when="@13.0.0:") - depends_on("tbb@2018.6.0:", when="@10.0.0:12.3.0") + depends_on("tbb") + requires("^[virtuals=tbb] intel-tbb@2019.9:", when="@13.0.0:") with when("@13.0.0:"): depends_on("cmake@3.14.0:", type="build") @@ -138,7 +138,7 @@ def cmake_args(self): args = [ "-DBoost_ROOT_DIR=%s" % spec["boost"].prefix, - "-DElfUtils_ROOT_DIR=%s" % spec["elf"].prefix, + "-DElfUtils_ROOT_DIR=%s" % spec["elfutils"].prefix, "-DLibIberty_ROOT_DIR=%s" % spec["libiberty"].prefix, "-DTBB_ROOT_DIR=%s" % spec["tbb"].prefix, self.define("LibIberty_LIBRARIES", spec["libiberty"].libs), @@ -167,7 +167,7 @@ def cmake_args(self): spec = self.spec # Elf -- the directory containing libelf.h. - elf = spec["elf"].prefix + elf = spec["elfutils"].prefix elf_include = os.path.dirname(find_headers("libelf", elf.include, recursive=True)[0]) # Dwarf -- the directory containing elfutils/libdw.h or @@ -183,7 +183,7 @@ def cmake_args(self): "-DPATH_BOOST=%s" % spec["boost"].prefix, "-DIBERTY_LIBRARIES=%s" % spec["libiberty"].libs, "-DLIBELF_INCLUDE_DIR=%s" % elf_include, - "-DLIBELF_LIBRARIES=%s" % spec["elf"].libs, + "-DLIBELF_LIBRARIES=%s" % spec["elfutils"].libs, "-DLIBDWARF_INCLUDE_DIR=%s" % dwarf_include, "-DLIBDWARF_LIBRARIES=%s" % dwarf_lib, ]