void-packages/srcpkgs/valgrind/patches/musl-fixes.patch

59 lines
2.1 KiB
Diff

diff -upr valgrind-3.11.0.orig/configure.ac valgrind-3.11.0/configure.ac
--- configure.ac 2015-10-03 02:28:18.597612716 +0200
+++ configure.ac 2015-10-03 02:28:49.284502749 +0200
@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in
;;
2.0|2.1|*)
AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
;;
esac
diff -upr valgrind-3.11.0.orig/coregrind/vg_preloaded.c valgrind-3.11.0/coregrind/vg_preloaded.c
--- coregrind/vg_preloaded.c 2015-10-03 02:28:18.367636023 +0200
+++ coregrind/vg_preloaded.c 2015-10-03 02:28:37.745672152 +0200
@@ -56,7 +56,7 @@
void VG_NOTIFY_ON_LOAD(freeres)( void );
void VG_NOTIFY_ON_LOAD(freeres)( void )
{
-# if !defined(__UCLIBC__) \
+# if defined(__GLIBC__) \
&& !defined(VGPV_arm_linux_android) \
&& !defined(VGPV_x86_linux_android) \
&& !defined(VGPV_mips32_linux_android) \
--- 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)
+# 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 +279,11 @@
/* --- Soname of the pthreads library. --- */
#if defined(VGO_linux)
+# if defined(__GLIBC__) || defined(__UCLIBC__)
# define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
+# else
+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
+# endif
#elif defined(VGO_darwin)
# define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
#elif defined(VGO_solaris)