diff options
| author | Phil Sutter <phil.sutter@viprinet.com> | 2011-01-07 18:21:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 10:45:26 +0100 |
| commit | 17e66a0ae47c6ac675870c3c55f638d3eacf8b93 (patch) | |
| tree | e06015f4ca5904fb96e78a1c22c0a15891f9f6f8 /package | |
| parent | a8f8dfc2e9ae14bb6a4073245306d967fec0efb1 (diff) | |
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>
Diffstat (limited to 'package')
| -rw-r--r-- | package/valgrind/patches/patch-auxprogs_valgrind-listener_c | 29 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-coregrind_launcher-linux_c | 29 |
2 files changed, 58 insertions, 0 deletions
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 |