wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-03 11:22:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

valgrind: fix musl patch.

Browse source 
Fixes helgrind.
Closes #4608.
This commit is contained in:
Christian Neukirchen 2016-09-28 19:51:32 +02:00
parent 8d9408daf6
commit 055c0e25a8
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/valgrind/patches/musl-fixes.patch
View file

@ -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_arm_linux_android) \
&& !defined(VGPV_x86_linux_android) \ && !defined(VGPV_x86_linux_android) \
&& !defined(VGPV_mips32_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.orig
--- include/pub_tool_redir.h 2015-10-03 02:28:18.304309107 +0200 +++ include/pub_tool_redir.h
+++ include/pub_tool_redir.h 2015-10-03 02:28:37.745672152 +0200 @@ -31,6 +31,7 @@
@@ -242,7 +242,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. --- */ /* --- Soname of the standard C library. --- */
#if defined(VGO_linux) || defined(VGO_solaris) #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.* +# define VG_Z_LIBC_SONAME libcZdZa // libc.*
+# endif
#elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6) #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
# define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
@@ -274,7 +274,11 @@ @@ -274,7 +279,11 @@
/* --- Soname of the pthreads library. --- */ /* --- Soname of the pthreads library. --- */
#if defined(VGO_linux) #if defined(VGO_linux)

2
srcpkgs/valgrind/template
View file

@ -1,7 +1,7 @@
# Template file for 'valgrind' # Template file for 'valgrind'
pkgname=valgrind pkgname=valgrind
version=3.11.0 version=3.11.0
revision=4 revision=5
only_for_archs="i686 x86_64 armv7l i686-musl x86_64-musl armv7l-musl" only_for_archs="i686 x86_64 armv7l i686-musl x86_64-musl armv7l-musl"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-tls --with-mpicc=/dev/null" configure_args="--enable-tls --with-mpicc=/dev/null"