From fd68f8916ca7243380639a539c3348aae87b53a3 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 8 Apr 2024 10:00:05 +0200 Subject: gperftools: add cmake build system (#43506) the autotools build system does something funky which causes a link line where gccs default link dirs are explicitly added and end up before the -L from spack's libunwind, so that ultimately it links against system libunwind. the cmake build system does better. --- .../repos/builtin/packages/gperftools/package.py | 44 ++++++++++++++++------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/var/spack/repos/builtin/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py index 42c07707a3..144ac5ddc8 100644 --- a/var/spack/repos/builtin/packages/gperftools/package.py +++ b/var/spack/repos/builtin/packages/gperftools/package.py @@ -3,10 +3,11 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.build_systems import autotools, cmake from spack.package import * -class Gperftools(AutotoolsPackage): +class Gperftools(AutotoolsPackage, CMakePackage): """Google's fast malloc/free implementation, especially for multi-threaded applications. Contains tcmalloc, heap-checker, heap-profiler, and cpu-profiler. @@ -19,6 +20,8 @@ class Gperftools(AutotoolsPackage): license("BSD-3-Clause") + build_system(conditional("cmake", when="@2.8.1:"), "autotools", default="cmake") + version("2.15", sha256="c69fef855628c81ef56f12e3c58f2b7ce1f326c0a1fe783e5cae0b88cbbe9a80") version("2.14", sha256="6b561baf304b53d0a25311bd2e29bc993bed76b7c562380949e7cb5e3846b299") version("2.13", sha256="4882c5ece69f8691e51ffd6486df7d79dbf43b0c909d84d3c0883e30d27323e7") @@ -43,21 +46,38 @@ class Gperftools(AutotoolsPackage): ) depends_on("unwind", when="+libunwind") + depends_on("cmake@3.12:", type="build", when="build_system=cmake") # Linker error: src/base/dynamic_annotations.cc:46: undefined reference to # `TCMallocGetenvSafe' conflicts("target=ppc64:", when="@2.14") conflicts("target=ppc64le:", when="@2.14") + # the autotools build system creates an explicit list of -L flags that end up + # before the -L flags, which causes the system libunwind to be linked instead of + # the spack libunwind. This is a workaround to fix that. + conflicts("+libunwind", when="build_system=autotools") + + +class CMakeBuilder(cmake.CMakeBuilder): + def cmake_args(self): + return [ + self.define_from_variant("gperftools_sized_delete", "sized_delete"), + self.define_from_variant( + "gperftools_dynamic_sized_delete_support", "dynamic_sized_delete_support" + ), + self.define_from_variant("GPERFTOOLS_BUILD_DEBUGALLOC", "debugalloc"), + self.define_from_variant("gperftools_enable_libunwind", "libunwind"), + ] + + +class AutotooolsBuilder(autotools.AutotoolsBuilder): def configure_args(self): - args = [] - args += self.enable_or_disable("sized-delete", variant="sized_delete") - args += self.enable_or_disable( - "dynamic-sized-delete-support", variant="dynamic_sized_delete_support" - ) - args += self.enable_or_disable("debugalloc") - args += self.enable_or_disable("libunwind") - if self.spec.satisfies("+libunwind"): - args += ["LDFLAGS=-lunwind"] - - return args + return [ + *self.enable_or_disable("sized-delete", variant="sized_delete"), + *self.enable_or_disable( + "dynamic-sized-delete-support", variant="dynamic_sized_delete_support" + ), + *self.enable_or_disable("debugalloc"), + *self.enable_or_disable("libunwind"), + ] -- cgit v1.2.3-70-g09d2