aboutsummaryrefslogtreecommitdiffstats
path: root/main/valgrind/musl-fixes.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-09-19 14:26:59 +0300
committerTimo Teräs <timo.teras@iki.fi>2014-09-19 14:28:23 +0300
commit5e1e7572ec7f0e485f14d3f418f7335ed8e6200a (patch)
treee577d429392837226de00145c5b970020f8cf7ff /main/valgrind/musl-fixes.patch
parent24917a8a6dde5ddc600a5ee941fff32813cf8476 (diff)
downloadaports-5e1e7572ec7f0e485f14d3f418f7335ed8e6200a.tar.bz2
aports-5e1e7572ec7f0e485f14d3f418f7335ed8e6200a.tar.xz
main/valgrind: ugprade to 3.10.0, additional musl fixes
Diffstat (limited to 'main/valgrind/musl-fixes.patch')
-rw-r--r--main/valgrind/musl-fixes.patch43
1 files changed, 38 insertions, 5 deletions
diff --git a/main/valgrind/musl-fixes.patch b/main/valgrind/musl-fixes.patch
index 7a2c4ba34c..573c75de23 100644
--- a/main/valgrind/musl-fixes.patch
+++ b/main/valgrind/musl-fixes.patch
@@ -1,11 +1,44 @@
---- ./configure.ac.orig 2014-04-03 05:54:36.931472516 +0000
-+++ ./configure.ac 2014-04-03 06:01:14.726289282 +0000
-@@ -931,8 +931,6 @@
+diff -ru valgrind-3.10.0.orig/configure.ac valgrind-3.10.0/configure.ac
+--- valgrind-3.10.0.orig/configure.ac 2014-09-11 12:12:44.000000000 -0300
++++ valgrind-3.10.0/configure.ac 2014-09-19 13:11:10.338289149 -0300
+@@ -1031,8 +1031,6 @@
*)
AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
-- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
-- AC_MSG_ERROR([or Darwin libc])
+- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.19])
+- AC_MSG_ERROR([or Darwin or Bionic libc])
;;
esac
+diff -ru valgrind-3.10.0.orig/coregrind/vg_preloaded.c valgrind-3.10.0/coregrind/vg_preloaded.c
+--- valgrind-3.10.0.orig/coregrind/vg_preloaded.c 2014-09-19 13:08:26.000000000 -0300
++++ valgrind-3.10.0/coregrind/vg_preloaded.c 2014-09-19 13:12:31.301626639 -0300
+@@ -57,7 +57,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)
+ extern void __libc_freeres(void);
+--- valgrind-3.10.0.orig/include/pub_tool_redir.h 2014-09-08 15:28:23.000000000 -0300
++++ valgrind-3.10.0/include/pub_tool_redir.h 2014-09-19 14:12:48.195145620 -0300
+@@ -241,7 +241,7 @@
+ /* --- Soname of the standard C library. --- */
+
+ #if defined(VGO_linux)
+-# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
++# define VG_Z_LIBC_SONAME libcZdZa // libc.*
+
+ #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
+ # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
+@@ -273,7 +273,7 @@
+ /* --- Soname of the pthreads library. --- */
+
+ #if defined(VGO_linux)
+-# define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
++# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
+ #elif defined(VGO_darwin)
+ # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
+ #else