summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/valgrind
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-05-11 10:35:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:30 +0100
commit4eec0cb20952689195599d2449208fd4c8c526a3 (patch)
treee8a3a0bc5cf015f703ea94fcfa3cc437d46a8615 /meta/recipes-devtools/valgrind
parenta6f67e23b85ee389e721fba9d36da462b7bc9945 (diff)
downloadpoky-4eec0cb20952689195599d2449208fd4c8c526a3.tar.gz
valgrind: Fix build with gcc6
(From OE-Core rev: d3eb2de1b522280d6a156319d54e59d85d59452b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch64
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.11.0.bb1
2 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch b/meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch
new file mode 100644
index 0000000000..76bc821872
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch
@@ -0,0 +1,64 @@
1backport fix from upstream to fix build errors with gcc 6
2
3http://valgrind.10908.n7.nabble.com/Valgrind-r15773-in-trunk-configure-ac-drd-tests-std-thread-cpp-drd-tests-std-thread2-cpp-td56109.html
4
5../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:3: error: '_Impl_base' is not a member of 'std::thread'
6 std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
7 ^~~
8../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:28: error: '__t' was not declared in this scope
9 std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
10 ^~~
11../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:59: error: '_Impl_base' in 'class std::thread' does not name a type
12 std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
13 ^~~~~~~~~~
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Upstream-Status: Backport
17
18Index: configure.ac
19===================================================================
20--- a/configure.ac (revision 15772)
21+++ b/configure.ac (revision 15773)
22@@ -160,7 +160,7 @@
23 icc-1[[3-9]].*)
24 AC_MSG_RESULT([ok (ICC version ${gcc_version})])
25 ;;
26- notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
27+ notclang-[[3-9]]|notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
28 AC_MSG_RESULT([ok (${gcc_version})])
29 ;;
30 clang-2.9|clang-[[3-9]].*|clang-[[1-9][0-9]]*)
31Index: drd/tests/std_thread2.cpp
32===================================================================
33--- a/drd/tests/std_thread2.cpp (revision 15772)
34+++ b/drd/tests/std_thread2.cpp (revision 15773)
35@@ -26,6 +26,7 @@
36 return 0;
37 }
38
39+#if defined(__GNUC__) && __GNUC__ -0 < 6
40 //
41 // From libstdc++-v3/src/c++11/thread.cc
42 //
43@@ -70,3 +71,4 @@
44 }
45 }
46 }
47+#endif
48Index: drd/tests/std_thread.cpp
49===================================================================
50--- a/drd/tests/std_thread.cpp (revision 15772)
51+++ b/drd/tests/std_thread.cpp (revision 15773)
52@@ -21,6 +21,7 @@
53 return 0;
54 }
55
56+#if defined(__GNUC__) && __GNUC__ -0 < 6
57 //
58 // From libstdc++-v3/src/c++11/thread.cc
59 //
60@@ -65,3 +66,4 @@
61 }
62 }
63 }
64+#endif
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb
index 824050075a..13354f4b5f 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb
@@ -23,6 +23,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
23 file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ 23 file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \
24 file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ 24 file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \
25 file://avoid-neon-for-targets-which-don-t-support-it.patch \ 25 file://avoid-neon-for-targets-which-don-t-support-it.patch \
26 file://gcc5-port.patch \
26" 27"
27SRC_URI_append_libc-musl = "\ 28SRC_URI_append_libc-musl = "\
28 file://0001-fix-build-for-musl-targets.patch \ 29 file://0001-fix-build-for-musl-targets.patch \