From fa97497566d97fa794ceda6910658604a119cc78 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Tue, 18 Aug 2015 14:34:37 +0200
Subject: [PATCH] Drop valgrind-3.9.0-stat_h.patch.
---
valgrind-3.9.0-stat_h.patch | 48 -------------------------------------
valgrind.spec | 9 ++++---
2 files changed, 4 insertions(+), 53 deletions(-)
delete mode 100644 valgrind-3.9.0-stat_h.patch
diff --git a/valgrind-3.9.0-stat_h.patch b/valgrind-3.9.0-stat_h.patch
deleted file mode 100644
index 628dd79..0000000
--- a/valgrind-3.9.0-stat_h.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
-@@ -328,6 +328,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
-@@ -366,6 +366,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
-@@ -410,6 +410,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
-@@ -446,6 +446,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;
diff --git a/valgrind.spec b/valgrind.spec
index 802cc8e..aad44df 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -66,11 +66,8 @@ Patch1: valgrind-3.9.0-cachegrind-improvements.patch
# KDE#211352 - helgrind races in helgrind's own mythread_wrapper
Patch2: valgrind-3.9.0-helgrind-race-supp.patch
-# undef st_atime, st_mtime and st_ctime. Unknown why this is (still?) needed.
-Patch3: valgrind-3.9.0-stat_h.patch
-
# Make ld.so supressions slightly less specific.
-Patch4: valgrind-3.9.0-ldso-supp.patch
+Patch3: valgrind-3.9.0-ldso-supp.patch
%if %{build_multilib}
# Ensure glibc{,-devel} is installed for both multilib arches
@@ -174,7 +171,6 @@ Valgrind User Manual for details.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
# We need to use the software collection compiler and binutils if available.
@@ -344,6 +340,9 @@ echo ===============END TESTING===============
%endif
%changelog
+* Tue Aug 18 2015 Mark Wielaard <mjw@redhat.com>
+- Drop valgrind-3.9.0-stat_h.patch.
+
* Mon Aug 17 2015 Mark Wielaard <mjw@redhat.com> - 3.10.1-21.svn20150817r15561
- Update to current valgrind svn. Drop patches now upstream.