TAU package: Include recent change for Ubuntu (#43572)
* Include recent change for Ubuntu
Select option -disable-no-pie-on-ubuntu for some Ubuntu systems
823971df01
* Added conflict for new variant
* Updated conflict version
* Added mention of Ubuntu to variant description
This commit is contained in:
parent
d680a0cb99
commit
c467bba73e
1 changed files with 9 additions and 1 deletions
|
@ -106,6 +106,12 @@ class Tau(Package):
|
||||||
)
|
)
|
||||||
variant("dyninst", default=False, description="Activates dyninst support")
|
variant("dyninst", default=False, description="Activates dyninst support")
|
||||||
|
|
||||||
|
variant(
|
||||||
|
"disable-no-pie",
|
||||||
|
default=False,
|
||||||
|
description="Do not add -no-pie while linking with Ubuntu.",
|
||||||
|
)
|
||||||
|
|
||||||
depends_on("cmake@3.14:", type="build", when="%clang")
|
depends_on("cmake@3.14:", type="build", when="%clang")
|
||||||
depends_on("zlib-api", type="link")
|
depends_on("zlib-api", type="link")
|
||||||
depends_on("pdt", when="+pdt") # Required for TAU instrumentation
|
depends_on("pdt", when="+pdt") # Required for TAU instrumentation
|
||||||
|
@ -145,7 +151,7 @@ class Tau(Package):
|
||||||
conflicts("+adios2", when="@:2.29.1")
|
conflicts("+adios2", when="@:2.29.1")
|
||||||
conflicts("+sqlite", when="@:2.29.1")
|
conflicts("+sqlite", when="@:2.29.1")
|
||||||
conflicts("+dyninst", when="@:2.32.1")
|
conflicts("+dyninst", when="@:2.32.1")
|
||||||
|
conflicts("+disable-no-pie", when="@:2.33.2")
|
||||||
patch("unwind.patch", when="@2.29.0")
|
patch("unwind.patch", when="@2.29.0")
|
||||||
|
|
||||||
filter_compiler_wrappers("Makefile", relative_root="include")
|
filter_compiler_wrappers("Makefile", relative_root="include")
|
||||||
|
@ -352,6 +358,8 @@ def install(self, spec, prefix):
|
||||||
if found:
|
if found:
|
||||||
break
|
break
|
||||||
options.append("-pythonlib=%s" % lib_path)
|
options.append("-pythonlib=%s" % lib_path)
|
||||||
|
if "+disable-no-pie" in spec:
|
||||||
|
options.append("-disable-no-pie-on-ubuntu")
|
||||||
|
|
||||||
if "+dyninst" in spec:
|
if "+dyninst" in spec:
|
||||||
options.append("-dyninst=%s" % spec["dyninst"].prefix)
|
options.append("-dyninst=%s" % spec["dyninst"].prefix)
|
||||||
|
|
Loading…
Reference in a new issue