zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dyninst: add missing dependencies

Browse Source
This commit is contained in:
Massimiliano Culpo 2024-11-16 09:44:23 +01:00
parent a69cf5b9ad
commit 35dea05048
No known key found for this signature in database
GPG Key ID: 3E52BB992233066C
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/dyninst/package.py
View File

@ -94,8 +94,8 @@ class Dyninst(CMakePackage):
conflicts("^intel-oneapi-tbb@2021.1:") conflicts("^intel-oneapi-tbb@2021.1:")
conflicts("^intel-parallel-studio") conflicts("^intel-parallel-studio")
depends_on("intel-tbb@2019.9:", when="@13.0.0:") depends_on("tbb")
depends_on("tbb@2018.6.0:", when="@10.0.0:12.3.0") requires("^[virtuals=tbb] intel-tbb@2019.9:", when="@13.0.0:")
with when("@13.0.0:"): with when("@13.0.0:"):
depends_on("cmake@3.14.0:", type="build") depends_on("cmake@3.14.0:", type="build")
@ -137,7 +137,7 @@ def cmake_args(self):
args = [ args = [
"-DBoost_ROOT_DIR=%s" % spec["boost"].prefix, "-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, "-DLibIberty_ROOT_DIR=%s" % spec["libiberty"].prefix,
"-DTBB_ROOT_DIR=%s" % spec["tbb"].prefix, "-DTBB_ROOT_DIR=%s" % spec["tbb"].prefix,
self.define("LibIberty_LIBRARIES", spec["libiberty"].libs), self.define("LibIberty_LIBRARIES", spec["libiberty"].libs),
@ -166,7 +166,7 @@ def cmake_args(self):
spec = self.spec spec = self.spec
# Elf -- the directory containing libelf.h. # 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]) elf_include = os.path.dirname(find_headers("libelf", elf.include, recursive=True)[0])
# Dwarf -- the directory containing elfutils/libdw.h or # Dwarf -- the directory containing elfutils/libdw.h or
@ -182,7 +182,7 @@ def cmake_args(self):
"-DPATH_BOOST=%s" % spec["boost"].prefix, "-DPATH_BOOST=%s" % spec["boost"].prefix,
"-DIBERTY_LIBRARIES=%s" % spec["libiberty"].libs, "-DIBERTY_LIBRARIES=%s" % spec["libiberty"].libs,
"-DLIBELF_INCLUDE_DIR=%s" % elf_include, "-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_INCLUDE_DIR=%s" % dwarf_include,
"-DLIBDWARF_LIBRARIES=%s" % dwarf_lib, "-DLIBDWARF_LIBRARIES=%s" % dwarf_lib,
] ]