mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-05 11:44:02 +00:00
Merge #109996: gperftools: fix build on darwin
This commit is contained in:
commit
86f83d5056
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }:
|
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gperftools-2.8";
|
name = "gperftools-2.8";
|
||||||
@ -20,21 +20,21 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
# tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
|
# tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
|
||||||
buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
|
buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
|
||||||
|
|
||||||
# Disable general dynamic TLS on AArch to support dlopen()'ing the library:
|
# Disable general dynamic TLS on AArch to support dlopen()'ing the library:
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558
|
||||||
configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
|
configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
|
||||||
"--disable-general-dynamic-tls";
|
"--disable-general-dynamic-tls";
|
||||||
|
|
||||||
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||||
substituteInPlace Makefile.am --replace stdc++ c++
|
substituteInPlace Makefile.am --replace stdc++ c++
|
||||||
substituteInPlace Makefile.in --replace stdc++ c++
|
substituteInPlace Makefile.in --replace stdc++ c++
|
||||||
substituteInPlace libtool --replace stdc++ c++
|
substituteInPlace libtool --replace stdc++ c++
|
||||||
'';
|
'';
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
|
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
|
||||||
"-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable";
|
"-D_XOPEN_SOURCE";
|
||||||
|
|
||||||
# some packages want to link to the static tcmalloc_minimal
|
# some packages want to link to the static tcmalloc_minimal
|
||||||
# to drop the runtime dependency on gperftools
|
# to drop the runtime dependency on gperftools
|
||||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/gperftools/gperftools";
|
homepage = "https://github.com/gperftools/gperftools";
|
||||||
description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
|
description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
|
||||||
platforms = with platforms; linux ++ darwin;
|
platforms = with platforms; linux ++ darwin;
|
||||||
|
Loading…
Reference in New Issue
Block a user