diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-08 23:45:47 +0100 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-12-23 10:21:18 +0100 |
| commit | 1b88488988611376bd44dcd8e5431705d2309276 (patch) | |
| tree | 0a93202193a0a5430e6cf6f2af2a1a24183c66f0 /pkgs/development/libraries/gperftools | |
| parent | 10f250f65c3a47c63d3f34eb8a4494362d28bbf8 (diff) | |
| download | nixlib-1b88488988611376bd44dcd8e5431705d2309276.tar nixlib-1b88488988611376bd44dcd8e5431705d2309276.tar.gz nixlib-1b88488988611376bd44dcd8e5431705d2309276.tar.bz2 nixlib-1b88488988611376bd44dcd8e5431705d2309276.tar.lz nixlib-1b88488988611376bd44dcd8e5431705d2309276.tar.xz nixlib-1b88488988611376bd44dcd8e5431705d2309276.tar.zst nixlib-1b88488988611376bd44dcd8e5431705d2309276.zip | |
gperftools: upgrade to 2.1
Diffstat (limited to 'pkgs/development/libraries/gperftools')
| -rw-r--r-- | pkgs/development/libraries/gperftools/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/gperftools/glibc-2.16.patch | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 76d1d8c41f75..c7c639f2adb8 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.0"; + name = "gperftools-2.1"; src = fetchurl { url = "https://gperftools.googlecode.com/files/${name}.tar.gz"; - sha1 = "da7181a7ba9b5ee7302daf6c16e886c179fe8d1b"; + sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk"; }; - patches = [ ./glibc-2.16.patch ]; - buildInputs = [ libunwind ]; + # some packages want to link to the static tcmalloc_minimal + # to drop the runtime dependency on gperftools + dontDisableStatic = true; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/gperftools/glibc-2.16.patch b/pkgs/development/libraries/gperftools/glibc-2.16.patch deleted file mode 100644 index b17e0d57f5fb..000000000000 --- a/pkgs/development/libraries/gperftools/glibc-2.16.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gperftools-2.0/src/base/linuxthreads.cc -=================================================================== ---- gperftools-2.0.orig/src/base/linuxthreads.cc -+++ gperftools-2.0/src/base/linuxthreads.cc -@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t - /* Signal handler to help us recover from dying while we are attached to - * other threads. - */ --static void SignalHandler(int signum, siginfo_t *si, void *data) { -+static void SignalHandler(int signum, struct siginfo *si, void *data) { - if (sig_pids != NULL) { - if (signum == SIGABRT) { - while (sig_num_threads-- > 0) { |