summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSoren Brinkmann <soren.brinkmann@xilinx.com>2017-07-09 00:35:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:38 +0100
commit6b490be5d119f932996ee8d0755ec331510da3b2 (patch)
treec095864e0cd8da8a83121b693fbbfe23141e8495 /meta
parentcc0d3d0936d2534e44eb4375c38d70af6148932e (diff)
downloadpoky-6b490be5d119f932996ee8d0755ec331510da3b2.tar.gz
valgrind: Update 3.12.0 -> 3.13.0
(From OE-Core rev: 99e00dc094afbff7785263b760e26e03ac09425f) Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-fix-build-for-musl-targets.patch69
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch34
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.13.0.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.12.0.bb)13
3 files changed, 26 insertions, 90 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-fix-build-for-musl-targets.patch b/meta/recipes-devtools/valgrind/valgrind/0001-fix-build-for-musl-targets.patch
deleted file mode 100644
index dc6feff7ff..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-fix-build-for-musl-targets.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From 1b1a024efd18d44294e184e792c1e039cab02bfe Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 14 Feb 2016 09:14:12 +0000
4Subject: [PATCH] fix build for musl targets
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 configure.ac | 2 --
11 coregrind/vg_preloaded.c | 2 +-
12 include/pub_tool_redir.h | 7 +++++--
13 3 files changed, 6 insertions(+), 5 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 9366dc7..679f514 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in
20 ;;
21 2.0|2.1|*)
22 AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
23- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
24- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
25 ;;
26 esac
27
28diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
29index 2ea7a7a..e49c832 100644
30--- a/coregrind/vg_preloaded.c
31+++ b/coregrind/vg_preloaded.c
32@@ -56,7 +56,7 @@
33 void VG_NOTIFY_ON_LOAD(freeres)( void );
34 void VG_NOTIFY_ON_LOAD(freeres)( void )
35 {
36-# if !defined(__UCLIBC__) \
37+# if !defined(__UCLIBC__) && defined(__GLIBC__) \
38 && !defined(VGPV_arm_linux_android) \
39 && !defined(VGPV_x86_linux_android) \
40 && !defined(VGPV_mips32_linux_android) \
41diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
42index bac00d7..fbb2ef2 100644
43--- a/include/pub_tool_redir.h
44+++ b/include/pub_tool_redir.h
45@@ -242,8 +242,7 @@
46 /* --- Soname of the standard C library. --- */
47
48 #if defined(VGO_linux) || defined(VGO_solaris)
49-# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
50-
51+# define VG_Z_LIBC_SONAME libcZdZa // libc.*
52 #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
53 # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
54
55@@ -274,7 +273,11 @@
56 /* --- Soname of the pthreads library. --- */
57
58 #if defined(VGO_linux)
59+# if defined(__GLIBC__) || defined(__UCLIBC__)
60 # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
61+# else
62+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
63+#endif
64 #elif defined(VGO_darwin)
65 # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
66 #elif defined(VGO_solaris)
67--
682.7.1
69
diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
index ed313d6444..39022d04ae 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
@@ -1,4 +1,4 @@
1From 38ae233b6893a4eec7f9ed6d8ad02392bca8eaed Mon Sep 17 00:00:00 2001 1From 739421e253e6eba3eb6438651822f80fa9c0502a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 15 Dec 2015 15:31:50 +0200 3Date: Tue, 15 Dec 2015 15:31:50 +0200
4Subject: [PATCH 1/2] Fix out of tree builds. 4Subject: [PATCH 1/2] Fix out of tree builds.
@@ -13,21 +13,21 @@ Upstream-Status: Pending
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 14
15--- 15---
16 configure.ac | 64 ++++++++++++++++++++++++++++++------------------------------ 16 configure.ac | 68 ++++++++++++++++++++++++++++++------------------------------
17 1 file changed, 32 insertions(+), 32 deletions(-) 17 1 file changed, 34 insertions(+), 34 deletions(-)
18 18
19diff --git a/configure.ac b/configure.ac 19diff --git a/configure.ac b/configure.ac
20index 8ab7f9b..9366dc7 100644 20index 3874296fde0b..7a5ba2c8557e 100644
21--- a/configure.ac 21--- a/configure.ac
22+++ b/configure.ac 22+++ b/configure.ac
23@@ -377,44 +377,44 @@ case "${host_os}" in 23@@ -373,50 +373,50 @@ case "${host_os}" in
24 9.*) 24 9.*)
25 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) 25 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
26 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) 26 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
27- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" 27- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
28- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" 28- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}"
29+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" 29+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}"
30+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" 30+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}"
31 ;; 31 ;;
32 10.*) 32 10.*)
33 AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) 33 AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard])
@@ -77,9 +77,17 @@ index 8ab7f9b..9366dc7 100644
77+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" 77+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}"
78+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 78+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
79 ;; 79 ;;
80 16.*)
81 AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra])
82 AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version])
83- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}"
84- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
85+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}"
86+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
87 ;;
80 *) 88 *)
81 AC_MSG_RESULT([unsupported (${kernel})]) 89 AC_MSG_RESULT([unsupported (${kernel})])
82@@ -426,13 +426,13 @@ case "${host_os}" in 90@@ -428,13 +428,13 @@ case "${host_os}" in
83 solaris2.11*) 91 solaris2.11*)
84 AC_MSG_RESULT([ok (${host_os})]) 92 AC_MSG_RESULT([ok (${host_os})])
85 VGCONF_OS="solaris" 93 VGCONF_OS="solaris"
@@ -95,7 +103,7 @@ index 8ab7f9b..9366dc7 100644
95 ;; 103 ;;
96 104
97 *) 105 *)
98@@ -1015,29 +1015,29 @@ AC_MSG_CHECKING([the glibc version]) 106@@ -982,29 +982,29 @@ AC_MSG_CHECKING([the glibc version])
99 case "${GLIBC_VERSION}" in 107 case "${GLIBC_VERSION}" in
100 2.2) 108 2.2)
101 AC_MSG_RESULT(${GLIBC_VERSION} family) 109 AC_MSG_RESULT(${GLIBC_VERSION} family)
@@ -135,7 +143,7 @@ index 8ab7f9b..9366dc7 100644
135 ;; 143 ;;
136 2.*) 144 2.*)
137 AC_MSG_RESULT(${GLIBC_VERSION} family) 145 AC_MSG_RESULT(${GLIBC_VERSION} family)
138@@ -1046,8 +1046,8 @@ case "${GLIBC_VERSION}" in 146@@ -1013,8 +1013,8 @@ case "${GLIBC_VERSION}" in
139 AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, 147 AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1,
140 [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) 148 [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)])
141 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 149 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
@@ -146,7 +154,7 @@ index 8ab7f9b..9366dc7 100644
146 ;; 154 ;;
147 darwin) 155 darwin)
148 AC_MSG_RESULT(Darwin) 156 AC_MSG_RESULT(Darwin)
149@@ -1057,7 +1057,7 @@ case "${GLIBC_VERSION}" in 157@@ -1024,7 +1024,7 @@ case "${GLIBC_VERSION}" in
150 bionic) 158 bionic)
151 AC_MSG_RESULT(Bionic) 159 AC_MSG_RESULT(Bionic)
152 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) 160 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
@@ -155,7 +163,7 @@ index 8ab7f9b..9366dc7 100644
155 ;; 163 ;;
156 solaris) 164 solaris)
157 AC_MSG_RESULT(Solaris) 165 AC_MSG_RESULT(Solaris)
158@@ -1079,11 +1079,11 @@ if test "$VGCONF_OS" != "solaris"; then 166@@ -1051,11 +1051,11 @@ if test "$VGCONF_OS" != "solaris"; then
159 # attempt to detect whether such libraries are installed on the 167 # attempt to detect whether such libraries are installed on the
160 # build machine (or even if any X facilities are present); just 168 # build machine (or even if any X facilities are present); just
161 # add the suppressions antidisirregardless. 169 # add the suppressions antidisirregardless.
@@ -171,5 +179,5 @@ index 8ab7f9b..9366dc7 100644
171 179
172 180
173-- 181--
1742.6.2 1822.13.2.3.g44cd85c14
175 183
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
index 0cc5eefc88..2ec9b9b6fc 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "http://valgrind.org/"
3BUGTRACKER = "http://valgrind.org/support/bug_reports.html" 3BUGTRACKER = "http://valgrind.org/support/bug_reports.html"
4LICENSE = "GPLv2 & GPLv2+ & BSD" 4LICENSE = "GPLv2 & GPLv2+ & BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://include/pub_tool_basics.h;beginline=1;endline=29;md5=ebb8e640ef633f940c425686c873f9fa \ 6 file://include/pub_tool_basics.h;beginline=6;endline=29;md5=d4de0407239381463cf01dd276d7c22e \
7 file://include/valgrind.h;beginline=1;endline=56;md5=4b5e24908e53016ea561c45f4234a327 \ 7 file://include/valgrind.h;beginline=1;endline=56;md5=ad3b317f3286b6b704575d9efe6ca5df \
8 file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56" 8 file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56"
9 9
10X11DEPENDS = "virtual/libx11" 10X11DEPENDS = "virtual/libx11"
@@ -12,7 +12,7 @@ DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d
12 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} \
13 " 13 "
14 14
15SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 15SRC_URI = "ftp://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
16 file://fixed-perl-path.patch \ 16 file://fixed-perl-path.patch \
17 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ 17 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
18 file://run-ptest \ 18 file://run-ptest \
@@ -37,11 +37,8 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
37 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ 37 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \
38 file://link-gz-tests.patch \ 38 file://link-gz-tests.patch \
39 " 39 "
40SRC_URI_append_libc-musl = "\ 40SRC_URI[md5sum] = "817dd08f1e8a66336b9ff206400a5369"
41 file://0001-fix-build-for-musl-targets.patch \ 41SRC_URI[sha256sum] = "d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b"
42"
43SRC_URI[md5sum] = "6eb03c0c10ea917013a7622e483d61bb"
44SRC_URI[sha256sum] = "67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1"
45 42
46COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' 43COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux'
47 44