diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-08-08 09:12:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-08-08 09:12:03 +0200 |
| commit | 564f440b370609923fcae0a5174144411ec00108 (patch) | |
| tree | 96542c1ad127a56623986baf55a1795690c5ff64 | |
| parent | 58c66ddc6a1935588c17ed101ddf0be88a898868 (diff) | |
| parent | 66d9d735d20b1f0ce9c4a54ebf73ee8225b564da (diff) | |
Merge #94704: gperftools: fix dlopen() on aarch64
| -rw-r--r-- | pkgs/development/libraries/gperftools/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 1899f4fdc9248..91b2c2929a489 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libunwind }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }: stdenv.mkDerivation rec { name = "gperftools-2.8"; @@ -8,9 +8,25 @@ stdenv.mkDerivation rec { 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 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 '' substituteInPlace Makefile.am --replace stdc++ c++ substituteInPlace Makefile.in --replace stdc++ c++ |