From 055c0e25a82abfe2e4bd0f9e2c10ad707aa79d30 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Wed, 28 Sep 2016 19:51:32 +0200
Subject: [PATCH] valgrind: fix musl patch.

Fixes helgrind.
Closes #4608.
---
 srcpkgs/valgrind/patches/musl-fixes.patch | 22 ++++++++++++++++------
 srcpkgs/valgrind/template                 |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/valgrind/patches/musl-fixes.patch b/srcpkgs/valgrind/patches/musl-fixes.patch
index 8c4d8ff1378..440128a4ccd 100644
--- a/srcpkgs/valgrind/patches/musl-fixes.patch
+++ b/srcpkgs/valgrind/patches/musl-fixes.patch
@@ -22,19 +22,29 @@ diff -upr valgrind-3.11.0.orig/coregrind/vg_preloaded.c valgrind-3.11.0/coregrin
        && !defined(VGPV_arm_linux_android) \
        && !defined(VGPV_x86_linux_android) \
        && !defined(VGPV_mips32_linux_android) \
-diff -upr valgrind-3.11.0.orig/include/pub_tool_redir.h valgrind-3.11.0/include/pub_tool_redir.h
---- include/pub_tool_redir.h	2015-10-03 02:28:18.304309107 +0200
-+++ include/pub_tool_redir.h	2015-10-03 02:28:37.745672152 +0200
-@@ -242,7 +242,7 @@
+--- include/pub_tool_redir.h.orig
++++ include/pub_tool_redir.h
+@@ -31,6 +31,7 @@
+ #ifndef __PUB_TOOL_REDIR_H
+ #define __PUB_TOOL_REDIR_H
+ 
++#include <features.h>
+ #include "config.h"           /* DARWIN_VERS */
+ 
+ /* The following macros facilitate function replacement and wrapping.
+@@ -242,7 +243,11 @@
  /* --- Soname of the standard C library. --- */
  
  #if defined(VGO_linux) || defined(VGO_solaris)
--#  define  VG_Z_LIBC_SONAME  libcZdsoZa              // libc.so*
++# if defined(__GLIBC__) || defined(__UCLIBC__)
+ #  define  VG_Z_LIBC_SONAME  libcZdsoZa              // libc.so*
++# else
 +#  define  VG_Z_LIBC_SONAME  libcZdZa                // libc.*
++# endif
  
  #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
  #  define  VG_Z_LIBC_SONAME  libSystemZdZaZddylib    // libSystem.*.dylib
-@@ -274,7 +274,11 @@
+@@ -274,7 +279,11 @@
  /* --- Soname of the pthreads library. --- */
  
  #if defined(VGO_linux)
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index f983ab597e1..86b58a30c64 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,7 +1,7 @@
 # Template file for 'valgrind'
 pkgname=valgrind
 version=3.11.0
-revision=4
+revision=5
 only_for_archs="i686 x86_64 armv7l i686-musl x86_64-musl armv7l-musl"
 build_style=gnu-configure
 configure_args="--enable-tls --with-mpicc=/dev/null"