From 17e66a0ae47c6ac675870c3c55f638d3eacf8b93 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Fri, 7 Jan 2011 18:21:49 +0100
Subject: valgrind: fix for somehow broken stuff

Although I could not find the exact spot, sys/stat.h was included which
\#defines st_atime to something making it unusable as custom field
identifier.

Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
---
 .../patches/patch-auxprogs_valgrind-listener_c     | 29 ++++++++++++++++++++++
 .../patches/patch-coregrind_launcher-linux_c       | 29 ++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 package/valgrind/patches/patch-auxprogs_valgrind-listener_c
 create mode 100644 package/valgrind/patches/patch-coregrind_launcher-linux_c

diff --git a/package/valgrind/patches/patch-auxprogs_valgrind-listener_c b/package/valgrind/patches/patch-auxprogs_valgrind-listener_c
new file mode 100644
index 000000000..be4b433ed
--- /dev/null
+++ b/package/valgrind/patches/patch-auxprogs_valgrind-listener_c
@@ -0,0 +1,29 @@
+	try to avoid problems with a pre #defined st_atime here, too
+--- valgrind-3.5.0.orig/auxprogs/valgrind-listener.c	2009-08-19 15:37:30.000000000 +0200
++++ valgrind-3.5.0/auxprogs/valgrind-listener.c	2010-12-30 17:23:49.807262269 +0100
+@@ -32,6 +32,12 @@
+ 
+ /*---------------------------------------------------------------*/
+ 
++#include "pub_core_basics.h"
++#include "pub_core_libcassert.h"    // For VG_BUGS_TO
++#include "pub_core_vki.h"           // Avoids warnings from 
++                                    // pub_core_libcfile.h
++#include "pub_core_libcfile.h"      // For VG_CLO_DEFAULT_LOGPORT
++
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -44,12 +50,6 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ 
+-#include "pub_core_basics.h"
+-#include "pub_core_libcassert.h"    // For VG_BUGS_TO
+-#include "pub_core_vki.h"           // Avoids warnings from 
+-                                    // pub_core_libcfile.h
+-#include "pub_core_libcfile.h"      // For VG_CLO_DEFAULT_LOGPORT
+-
+ 
+ /*---------------------------------------------------------------*/
+ 
diff --git a/package/valgrind/patches/patch-coregrind_launcher-linux_c b/package/valgrind/patches/patch-coregrind_launcher-linux_c
new file mode 100644
index 000000000..e94ffd908
--- /dev/null
+++ b/package/valgrind/patches/patch-coregrind_launcher-linux_c
@@ -0,0 +1,29 @@
+	try to avoid errors regarding already #defined st_atime in bits/stat.h or so
+--- valgrind-3.5.0.orig/coregrind/launcher-linux.c	2009-08-19 15:37:47.000000000 +0200
++++ valgrind-3.5.0/coregrind/launcher-linux.c	2010-12-30 17:08:00.035938916 +0100
+@@ -32,6 +32,12 @@
+    and so it doesn't have to conform to Valgrind's arcane rules on
+    no-glibc-usage etc. */
+ 
++#include "pub_core_debuglog.h"
++#include "pub_core_vki.h"       // Avoids warnings from
++                                // pub_core_libcfile.h
++#include "pub_core_libcproc.h"  // For VALGRIND_LIB, VALGRIND_LAUNCHER
++#include "pub_core_ume.h"
++
+ #include <assert.h>
+ #include <ctype.h>
+ #include <elf.h>
+@@ -45,12 +51,6 @@
+ #include <sys/user.h>
+ #include <unistd.h>
+ 
+-#include "pub_core_debuglog.h"
+-#include "pub_core_vki.h"       // Avoids warnings from
+-                                // pub_core_libcfile.h
+-#include "pub_core_libcproc.h"  // For VALGRIND_LIB, VALGRIND_LAUNCHER
+-#include "pub_core_ume.h"
+-
+ 
+ 
+ #define PATH_MAX 4096 /* POSIX refers to this a lot but I dunno
-- 
cgit v1.2.3