diff options
| author | jalcaraz <jordi_alc@hotmail.com> | 2024-04-11 21:06:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-11 12:06:34 -0700 |
| commit | c467bba73e156b57482cac434a124fa1483e89c9 (patch) | |
| tree | 2750f10b0240450d7230d81e642ac325a1d921cd | |
| parent | d680a0cb9972946f02153624ef9feaed86eea410 (diff) | |
| download | spack-c467bba73e156b57482cac434a124fa1483e89c9.tar.gz spack-c467bba73e156b57482cac434a124fa1483e89c9.tar.bz2 spack-c467bba73e156b57482cac434a124fa1483e89c9.tar.xz spack-c467bba73e156b57482cac434a124fa1483e89c9.zip | |
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
| -rw-r--r-- | var/spack/repos/builtin/packages/tau/package.py | 10 |
1 files changed, 9 insertions, 1 deletions
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) |