diff options
author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2018-10-20 01:40:26 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-20 22:40:16 +0100 |
commit | bc98a1e89dcd7b3f59f99e4382439d9028ba4db2 (patch) | |
tree | 30eacab721ada65088f863183221bbee51b8e34c /meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch | |
parent | c4acf1b531843497297c492456daea1744400faa (diff) | |
download | poky-bc98a1e89dcd7b3f59f99e4382439d9028ba4db2.tar.gz |
valgrind: update from 3.13.0 to 3.14.0
The removed patches are all upstream.
Adjusted two patches due to rebase.
Guard against __GLIBC_PREREQ for musl libc
(From OE-Core rev: 37841ec56d7756ec9ee00e2a2005681b220f6f5d)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch | 49 |
1 files changed, 27 insertions, 22 deletions
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 39022d04ae..75bb0aa7cb 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,7 +1,7 @@ | |||
1 | From 739421e253e6eba3eb6438651822f80fa9c0502a Mon Sep 17 00:00:00 2001 | 1 | From 8f916dcb395fe5a2429f2867ba4daf8ef3af073a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> |
3 | Date: Tue, 15 Dec 2015 15:31:50 +0200 | 3 | Date: Tue, 16 Oct 2018 21:01:04 -0400 |
4 | Subject: [PATCH 1/2] Fix out of tree builds. | 4 | Subject: [PATCH] Fix out of tree builds. |
5 | 5 | ||
6 | The paths to these files need to be fully specified in | 6 | The paths to these files need to be fully specified in |
7 | the out of tree build case. glibc-2.X.supp is a generated file so the full path | 7 | the out of tree build case. glibc-2.X.supp is a generated file so the full path |
@@ -9,18 +9,21 @@ is deliberately not specified in that case. | |||
9 | 9 | ||
10 | RP 2013/03/23 | 10 | RP 2013/03/23 |
11 | 11 | ||
12 | Patch refreshed for valgrind-3.14.0. | ||
13 | |||
12 | Upstream-Status: Pending | 14 | Upstream-Status: Pending |
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | 15 | ||
16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
17 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
15 | --- | 18 | --- |
16 | configure.ac | 68 ++++++++++++++++++++++++++++++------------------------------ | 19 | configure.ac | 68 ++++++++++++++++++++++++++-------------------------- |
17 | 1 file changed, 34 insertions(+), 34 deletions(-) | 20 | 1 file changed, 34 insertions(+), 34 deletions(-) |
18 | 21 | ||
19 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
20 | index 3874296fde0b..7a5ba2c8557e 100644 | 23 | index c18ae5f2a..99667ce57 100644 |
21 | --- a/configure.ac | 24 | --- a/configure.ac |
22 | +++ b/configure.ac | 25 | +++ b/configure.ac |
23 | @@ -373,50 +373,50 @@ case "${host_os}" in | 26 | @@ -392,50 +392,50 @@ case "${host_os}" in |
24 | 9.*) | 27 | 9.*) |
25 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) | 28 | 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]) | 29 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) |
@@ -85,16 +88,18 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
85 | + DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" | 88 | + DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" |
86 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 89 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
87 | ;; | 90 | ;; |
88 | *) | 91 | 17.*) |
89 | AC_MSG_RESULT([unsupported (${kernel})]) | 92 | AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) |
90 | @@ -428,13 +428,13 @@ case "${host_os}" in | 93 | @@ -460,7 +460,7 @@ case "${host_os}" in |
91 | solaris2.11*) | 94 | DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" |
92 | AC_MSG_RESULT([ok (${host_os})]) | 95 | ;; |
93 | VGCONF_OS="solaris" | 96 | *) |
94 | - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" | 97 | - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" |
95 | + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" | 98 | + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" |
99 | ;; | ||
100 | esac | ||
96 | ;; | 101 | ;; |
97 | 102 | @@ -468,7 +468,7 @@ case "${host_os}" in | |
98 | solaris2.12*) | 103 | solaris2.12*) |
99 | AC_MSG_RESULT([ok (${host_os})]) | 104 | AC_MSG_RESULT([ok (${host_os})]) |
100 | VGCONF_OS="solaris" | 105 | VGCONF_OS="solaris" |
@@ -103,7 +108,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
103 | ;; | 108 | ;; |
104 | 109 | ||
105 | *) | 110 | *) |
106 | @@ -982,29 +982,29 @@ AC_MSG_CHECKING([the glibc version]) | 111 | @@ -1051,29 +1051,29 @@ AC_MSG_CHECKING([the glibc version]) |
107 | case "${GLIBC_VERSION}" in | 112 | case "${GLIBC_VERSION}" in |
108 | 2.2) | 113 | 2.2) |
109 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 114 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
@@ -143,7 +148,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
143 | ;; | 148 | ;; |
144 | 2.*) | 149 | 2.*) |
145 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 150 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
146 | @@ -1013,8 +1013,8 @@ case "${GLIBC_VERSION}" in | 151 | @@ -1082,8 +1082,8 @@ case "${GLIBC_VERSION}" in |
147 | AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, | 152 | AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, |
148 | [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) | 153 | [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) |
149 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | 154 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
@@ -154,7 +159,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
154 | ;; | 159 | ;; |
155 | darwin) | 160 | darwin) |
156 | AC_MSG_RESULT(Darwin) | 161 | AC_MSG_RESULT(Darwin) |
157 | @@ -1024,7 +1024,7 @@ case "${GLIBC_VERSION}" in | 162 | @@ -1093,7 +1093,7 @@ case "${GLIBC_VERSION}" in |
158 | bionic) | 163 | bionic) |
159 | AC_MSG_RESULT(Bionic) | 164 | AC_MSG_RESULT(Bionic) |
160 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) | 165 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) |
@@ -163,7 +168,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
163 | ;; | 168 | ;; |
164 | solaris) | 169 | solaris) |
165 | AC_MSG_RESULT(Solaris) | 170 | AC_MSG_RESULT(Solaris) |
166 | @@ -1051,11 +1051,11 @@ if test "$VGCONF_OS" != "solaris"; then | 171 | @@ -1120,11 +1120,11 @@ if test "$VGCONF_OS" != "solaris"; then |
167 | # attempt to detect whether such libraries are installed on the | 172 | # attempt to detect whether such libraries are installed on the |
168 | # build machine (or even if any X facilities are present); just | 173 | # build machine (or even if any X facilities are present); just |
169 | # add the suppressions antidisirregardless. | 174 | # add the suppressions antidisirregardless. |
@@ -179,5 +184,5 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
179 | 184 | ||
180 | 185 | ||
181 | -- | 186 | -- |
182 | 2.13.2.3.g44cd85c14 | 187 | 2.17.0 |
183 | 188 | ||