Skip to content
Snippets Groups Projects
Unverified Commit e6e67f8e authored by jgraciahlrs's avatar jgraciahlrs Committed by GitHub
Browse files

extrae: tighten dependencies on boost for +dyninst (#48938)

parent e6bef4ca
No related branches found
No related tags found
No related merge requests found
...@@ -73,10 +73,6 @@ class Extrae(AutotoolsPackage): ...@@ -73,10 +73,6 @@ class Extrae(AutotoolsPackage):
depends_on("mpi") depends_on("mpi")
depends_on("libunwind") depends_on("libunwind")
# TODO: replace this with an explicit list of components of Boost,
# for instance depends_on('boost +filesystem')
# See https://github.com/spack/spack/pull/22303 for reference
depends_on(Boost.with_default_variants)
depends_on("libdwarf") depends_on("libdwarf")
depends_on("elf", type="link") depends_on("elf", type="link")
depends_on("libxml2") depends_on("libxml2")
...@@ -92,6 +88,10 @@ class Extrae(AutotoolsPackage): ...@@ -92,6 +88,10 @@ class Extrae(AutotoolsPackage):
variant("dyninst", default=False, description="Use dyninst for dynamic code installation") variant("dyninst", default=False, description="Use dyninst for dynamic code installation")
with when("+dyninst"): with when("+dyninst"):
depends_on("dyninst@10.1.0:") depends_on("dyninst@10.1.0:")
# TODO: replace this with an explicit list of components of Boost,
# for instance depends_on('boost +filesystem')
# See https://github.com/spack/spack/pull/22303 for reference
depends_on(Boost.with_default_variants)
depends_on("elfutils", when="@4.1.2:") depends_on("elfutils", when="@4.1.2:")
depends_on("intel-oneapi-tbb", when="@4.1.2:") depends_on("intel-oneapi-tbb", when="@4.1.2:")
...@@ -127,7 +127,6 @@ def configure_args(self): ...@@ -127,7 +127,6 @@ def configure_args(self):
args = [ args = [
"--with-mpi=%s" % mpiroot, "--with-mpi=%s" % mpiroot,
"--with-unwind=%s" % spec["libunwind"].prefix, "--with-unwind=%s" % spec["libunwind"].prefix,
"--with-boost=%s" % spec["boost"].prefix,
"--with-dwarf=%s" % spec["libdwarf"].prefix, "--with-dwarf=%s" % spec["libdwarf"].prefix,
"--with-elf=%s" % spec["elf"].prefix, "--with-elf=%s" % spec["elf"].prefix,
"--with-xml-prefix=%s" % spec["libxml2"].prefix, "--with-xml-prefix=%s" % spec["libxml2"].prefix,
...@@ -141,7 +140,10 @@ def configure_args(self): ...@@ -141,7 +140,10 @@ def configure_args(self):
) )
if spec.satisfies("+dyninst"): if spec.satisfies("+dyninst"):
args += ["--with-dyninst={spec['dyninst'].prefix}"] args += [
f"--with-dyninst={spec['dyninst'].prefix}",
f"--with-boost={spec['boost'].prefix}",
]
if spec.satisfies("@4.1.2:"): if spec.satisfies("@4.1.2:"):
args += [ args += [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment