rpms/valgrind/F-12 valgrind-3.5.0-stat_h.patch, NONE, 1.1 valgrind.spec, 1.79, 1.80

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4213

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-stat_h.patch 
Log Message:
3.5.0-14

valgrind-3.5.0-stat_h.patch:
 vki-amd64-linux.h |    3 +++
 vki-ppc32-linux.h |    3 +++
 vki-ppc64-linux.h |    3 +++
 vki-x86-linux.h   |    3 +++
 4 files changed, 12 insertions(+)

--- NEW FILE valgrind-3.5.0-stat_h.patch ---
--- valgrind/include/vki/vki-amd64-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
+++ valgrind/include/vki/vki-amd64-linux.h	2010-01-20 04:41:52.662552000 -0500
@@ -310,6 +310,9 @@ struct vki_stat {
 	long		st_blksize;
 	long		st_blocks;	/* Number 512-byte blocks allocated. */
 
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
 	unsigned long	st_atime;
 	unsigned long 	st_atime_nsec; 
 	unsigned long	st_mtime;
--- valgrind/include/vki/vki-x86-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
+++ valgrind/include/vki/vki-x86-linux.h	2010-01-20 04:42:19.649995000 -0500
@@ -348,6 +348,9 @@ struct vki_stat {
 	unsigned long  st_size;
 	unsigned long  st_blksize;
 	unsigned long  st_blocks;
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
 	unsigned long  st_atime;
 	unsigned long  st_atime_nsec;
 	unsigned long  st_mtime;
--- valgrind/include/vki/vki-ppc32-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
+++ valgrind/include/vki/vki-ppc32-linux.h	2010-01-20 04:42:44.861651000 -0500
@@ -392,6 +392,9 @@ struct vki_stat {
    long			st_size;
    unsigned long	st_blksize;
    unsigned long	st_blocks;
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
    unsigned long	st_atime;
    unsigned long	st_atime_nsec;
    unsigned long	st_mtime;
--- valgrind/include/vki/vki-ppc64-linux.h.jj	2009-08-19 09:37:07.000000000 -0400
+++ valgrind/include/vki/vki-ppc64-linux.h	2010-01-20 04:43:05.579922000 -0500
@@ -428,6 +428,9 @@ struct vki_stat {
   long            st_size;
   unsigned long   st_blksize;
   unsigned long   st_blocks;
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
   unsigned long   st_atime;
   unsigned long   st_atime_nsec;
   unsigned long   st_mtime;


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- valgrind.spec	20 Jan 2010 09:24:19 -0000	1.79
+++ valgrind.spec	20 Jan 2010 09:46:21 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -25,6 +25,7 @@ Patch18: valgrind-3.5.0-dynbss.patch
 Patch19: valgrind-3.5.0-adjtimex.patch
 Patch20: valgrind-3.5.0-DW_OP_mod.patch
 Patch21: valgrind-3.5.0-pkgconfig.patch
+Patch22: valgrind-3.5.0-stat_h.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -99,6 +100,7 @@ or valgrind plugins.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -184,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jan 20 2010 Jakub Jelinek <jakub at redhat.com> 3.5.0-14
+- fix build against latest glibc headers
+
 * Wed Jan 20 2010 Jakub Jelinek <jakub at redhat.com> 3.5.0-13
 - DW_OP_mod is unsigned modulus instead of signed
 - fix up valgrind.pc (#551277)