diff options
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 | 34 |
1 files changed, 21 insertions, 13 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 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 @@ | |||
1 | From 38ae233b6893a4eec7f9ed6d8ad02392bca8eaed Mon Sep 17 00:00:00 2001 | 1 | From 739421e253e6eba3eb6438651822f80fa9c0502a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 15 Dec 2015 15:31:50 +0200 | 3 | Date: Tue, 15 Dec 2015 15:31:50 +0200 |
4 | Subject: [PATCH 1/2] Fix out of tree builds. | 4 | Subject: [PATCH 1/2] Fix out of tree builds. |
@@ -13,21 +13,21 @@ Upstream-Status: Pending | |||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 13 | Signed-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 | ||
19 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
20 | index 8ab7f9b..9366dc7 100644 | 20 | index 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 | -- |
174 | 2.6.2 | 182 | 2.13.2.3.g44cd85c14 |
175 | 183 | ||