From 14f4a15e5a55bd90fa1efeeb945b162c00c0aae8 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Feb 18 2017 15:58:23 +0000 Subject: Add valgrind-3.12.0-tests-cxx11_abi_0.patch --- diff --git a/valgrind-3.12.0-tests-cxx11_abi_0.patch b/valgrind-3.12.0-tests-cxx11_abi_0.patch new file mode 100644 index 0000000..271ed6b --- /dev/null +++ b/valgrind-3.12.0-tests-cxx11_abi_0.patch @@ -0,0 +1,85 @@ +commit 4e66d0f7ca6ef2cac6c303e761af605c82b78456 +Author: petarj +Date: Tue Jan 31 18:22:20 2017 +0000 + + force old implementation of std::string for leak_cpp_interior test + + This patch forces leak_cpp_interior to be compiled using old implementation + of std::string. + + Related issue #373069 + + Patch by Aleksandar Rikalo. + + + git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16217 a5019735-40e9-0310-863c-91ae7b9d1cf9 + +diff --git a/memcheck/tests/leak_cpp_interior.cpp b/memcheck/tests/leak_cpp_interior.cpp +index f66fc89..a4b4824 100644 +--- a/memcheck/tests/leak_cpp_interior.cpp ++++ b/memcheck/tests/leak_cpp_interior.cpp +@@ -1,3 +1,4 @@ ++#define _GLIBCXX_USE_CXX11_ABI 0 + #define __STDC_FORMAT_MACROS + #include + #include +diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp b/memcheck/tests/leak_cpp_interior.stderr.exp +index 3228f74..70e2764 100644 +--- a/memcheck/tests/leak_cpp_interior.stderr.exp ++++ b/memcheck/tests/leak_cpp_interior.stderr.exp +@@ -2,8 +2,8 @@ + valgrind output will go to log + VALGRIND_DO_LEAK_CHECK + 4 bytes in 1 blocks are definitely lost in loss record ... of ... +- by 0x........: doit() (leak_cpp_interior.cpp:115) +- by 0x........: main (leak_cpp_interior.cpp:130) ++ by 0x........: doit() (leak_cpp_interior.cpp:116) ++ by 0x........: main (leak_cpp_interior.cpp:131) + + LEAK SUMMARY: + definitely lost: 4 bytes in 1 blocks +diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit +index 7a862a3..612fa3e 100644 +--- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit ++++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit +@@ -2,8 +2,8 @@ + valgrind output will go to log + VALGRIND_DO_LEAK_CHECK + 8 bytes in 1 blocks are definitely lost in loss record ... of ... +- by 0x........: doit() (leak_cpp_interior.cpp:115) +- by 0x........: main (leak_cpp_interior.cpp:130) ++ by 0x........: doit() (leak_cpp_interior.cpp:116) ++ by 0x........: main (leak_cpp_interior.cpp:131) + + LEAK SUMMARY: + definitely lost: 8 bytes in 1 blocks +diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris +index d53e4ce..f7e1a07 100644 +--- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris ++++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris +@@ -2,8 +2,8 @@ + valgrind output will go to log + VALGRIND_DO_LEAK_CHECK + 8 bytes in 1 blocks are definitely lost in loss record ... of ... +- by 0x........: doit() (leak_cpp_interior.cpp:115) +- by 0x........: main (leak_cpp_interior.cpp:130) ++ by 0x........: doit() (leak_cpp_interior.cpp:116) ++ by 0x........: main (leak_cpp_interior.cpp:131) + + LEAK SUMMARY: + definitely lost: 8 bytes in 1 blocks +diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-solaris b/memcheck/tests/leak_cpp_interior.stderr.exp-solaris +index 80cd5c3..f9fc390 100644 +--- a/memcheck/tests/leak_cpp_interior.stderr.exp-solaris ++++ b/memcheck/tests/leak_cpp_interior.stderr.exp-solaris +@@ -2,8 +2,8 @@ + valgrind output will go to log + VALGRIND_DO_LEAK_CHECK + 4 bytes in 1 blocks are definitely lost in loss record ... of ... +- by 0x........: doit() (leak_cpp_interior.cpp:115) +- by 0x........: main (leak_cpp_interior.cpp:130) ++ by 0x........: doit() (leak_cpp_interior.cpp:116) ++ by 0x........: main (leak_cpp_interior.cpp:131) + + LEAK SUMMARY: + definitely lost: 4 bytes in 1 blocks diff --git a/valgrind.spec b/valgrind.spec index ea1062d..919958d 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -110,6 +110,9 @@ Patch13: valgrind-3.12.0-x86-gdt-and-ss.patch # KDE#348616 - Wine/valgrind: noted but unhandled ioctl 0x5390 (DVD_READ_STRUCT) Patch14: valgrind-3.12.0-cd-dvd-ioctl.patch +# KDE#373069 force old implementation of std::string for leak_cpp_interior test +Patch15: valgrind-3.12.0-tests-cxx11_abi_0.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 @@ -233,6 +236,7 @@ Valgrind User Manual for details. %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build # We need to use the software collection compiler and binutils if available. @@ -435,6 +439,7 @@ echo ===============END TESTING=============== - Add valgrind-3.12.0-deregister-stack.patch - Add valgrind-3.12.0-x86-gdt-and-ss.patch - Add valgrind-3.12.0-cd-dvd-ioctl.patch +- Add valgrind-3.12.0-tests-cxx11_abi_0.patch * Fri Feb 17 2017 Mark Wielaard - 3.12.0-5 - Add valgrind-3.12.0-ppc64-r2.patch (#1424367)