From 515590a41f617dffd1df0703038f6f29d29b43fd Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 18 Sep 2015 21:31:14 +0200 Subject: [PATCH] Add valgrind-3.11.0-glibc-futex-message.patch --- valgrind-3.11.0-glibc-futex-message.patch | 14 ++++++++++++++ valgrind.spec | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 valgrind-3.11.0-glibc-futex-message.patch diff --git a/valgrind-3.11.0-glibc-futex-message.patch b/valgrind-3.11.0-glibc-futex-message.patch new file mode 100644 index 0000000..0984099 --- /dev/null +++ b/valgrind-3.11.0-glibc-futex-message.patch @@ -0,0 +1,14 @@ +diff --git a/tests/filter_libc b/tests/filter_libc +index 5d8e0ac..9a508b0 100755 +--- a/tests/filter_libc ++++ b/tests/filter_libc +@@ -36,6 +36,9 @@ while (<>) + s/(at.*)__builtin_vec_delete/$1...operator delete[].../; + s/(at.*)operator delete\[\]\(void\*\)/$1...operator delete[].../; + ++ # Some glibc versions complain about unexpected futex syscall errors. ++ s/The futex facility returned an unexpected error code.//; ++ + print; + } + diff --git a/valgrind.spec b/valgrind.spec index c77cfd2..a703de2 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -55,6 +55,9 @@ Patch2: valgrind-3.9.0-helgrind-race-supp.patch # Make ld.so supressions slightly less specific. Patch3: valgrind-3.9.0-ldso-supp.patch +# Suppress glibc futex warning messages in testsuite. +Patch4: valgrind-3.11.0-glibc-futex-message.patch + %if %{build_multilib} # Ensure glibc{,-devel} is installed for both multilib arches BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so @@ -162,6 +165,7 @@ 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. @@ -339,6 +343,7 @@ echo ===============END TESTING=============== %changelog * Fri Sep 18 2015 Mark Wielaard - Make sure some info about the system is in the build.log before check. +- Add valgrind-3.11.0-glibc-futex-message.patch * Tue Sep 15 2015 Orion Poplawski - 1:3.11.0-0.2.TEST1 - Rebuild for openmpi 1.10.0