BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #94704: gperftools: fix dlopen() on aarch64

Browse source
This commit is contained in:
Vladimír Čunát 2020-08-08 09:12:03 +02:00
commit 564f440b37
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/gperftools/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libunwind }: { stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gperftools-2.8"; name = "gperftools-2.8";
@ -8,9 +8,25 @@ stdenv.mkDerivation rec {
sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394"; sha256 = "0gjiplvday50x695pwjrysnvm5wfvg2b0gmqf6b4bdi8sv6yl394";
}; };
patches = [
# Add the --disable-general-dynamic-tls configure option:
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/gperftools/raw/f62d87a34f56f64fb8eb86727e34fbc2d3f5294a/f/gperftools-2.7.90-disable-generic-dynamic-tls.patch";
sha256 = "02falhpaqkl27hl1dib4yvmhwsddmgbw0krb46w31fyf3awb2ydv";
})
];
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 = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
# Disable general dynamic TLS on AArch to support dlopen()'ing the library:
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558
configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
"--disable-general-dynamic-tls";
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = stdenv.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++