From c467bba73e156b57482cac434a124fa1483e89c9 Mon Sep 17 00:00:00 2001 From: jalcaraz Date: Thu, 11 Apr 2024 21:06:34 +0200 Subject: TAU package: Include recent change for Ubuntu (#43572) * Include recent change for Ubuntu Select option -disable-no-pie-on-ubuntu for some Ubuntu systems https://github.com/UO-OACISS/tau2/commit/823971df015f2d28bf565b267c758f2deefa0cc9 * Added conflict for new variant * Updated conflict version * Added mention of Ubuntu to variant description --- var/spack/repos/builtin/packages/tau/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 1827282c55..e8a7051ec8 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -106,6 +106,12 @@ class Tau(Package): ) 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("zlib-api", type="link") depends_on("pdt", when="+pdt") # Required for TAU instrumentation @@ -145,7 +151,7 @@ class Tau(Package): conflicts("+adios2", when="@:2.29.1") conflicts("+sqlite", when="@:2.29.1") conflicts("+dyninst", when="@:2.32.1") - + conflicts("+disable-no-pie", when="@:2.33.2") patch("unwind.patch", when="@2.29.0") filter_compiler_wrappers("Makefile", relative_root="include") @@ -352,6 +358,8 @@ class Tau(Package): if found: break options.append("-pythonlib=%s" % lib_path) + if "+disable-no-pie" in spec: + options.append("-disable-no-pie-on-ubuntu") if "+dyninst" in spec: options.append("-dyninst=%s" % spec["dyninst"].prefix) -- cgit v1.2.3-70-g09d2