diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-23 17:36:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-23 17:40:27 +0000 |
commit | e6dad38c658ddae017f6c38551b5805f869536f7 (patch) | |
tree | b13b9fab45a373150d9772ad996d291626133db5 /meta/recipes-devtools/valgrind/valgrind-3.8.1 | |
parent | 554e3d254075a75a0ce8e114ab5144fff5440440 (diff) | |
download | poky-e6dad38c658ddae017f6c38551b5805f869536f7.tar.gz |
valgrind: Fix out of tree builds
(From OE-Core rev: 1944d362866fef1af406ed50955f1ed7cd9c29a8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind-3.8.1')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind-3.8.1/sepbuildfix.patch | 235 |
1 files changed, 235 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/sepbuildfix.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/sepbuildfix.patch new file mode 100644 index 0000000000..fe3f8da18d --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/sepbuildfix.patch | |||
@@ -0,0 +1,235 @@ | |||
1 | Fix out of tree builds. The paths to these files need to be fully specified in | ||
2 | the out of tree build case. glibc-2.X.supp is a generated file so the full path | ||
3 | is deliberately not specified in that case. | ||
4 | |||
5 | RP 2013/03/23 | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: valgrind-3.8.1/configure.in | ||
10 | =================================================================== | ||
11 | --- valgrind-3.8.1.orig/configure.in 2013-03-23 16:06:58.388793432 +0000 | ||
12 | +++ valgrind-3.8.1/configure.in 2013-03-23 16:46:15.088737377 +0000 | ||
13 | @@ -316,26 +316,26 @@ | ||
14 | 9.*) | ||
15 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) | ||
16 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) | ||
17 | - DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" | ||
18 | - DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" | ||
19 | + DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" | ||
20 | + DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" | ||
21 | ;; | ||
22 | 10.*) | ||
23 | AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) | ||
24 | AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) | ||
25 | - DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" | ||
26 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
27 | + DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" | ||
28 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
29 | ;; | ||
30 | 11.*) | ||
31 | AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) | ||
32 | AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) | ||
33 | - DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" | ||
34 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
35 | + DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" | ||
36 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
37 | ;; | ||
38 | 12.*) | ||
39 | AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) | ||
40 | AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) | ||
41 | - DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" | ||
42 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
43 | + DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" | ||
44 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
45 | ;; | ||
46 | *) | ||
47 | AC_MSG_RESULT([unsupported (${kernel})]) | ||
48 | @@ -805,124 +805,124 @@ | ||
49 | 2.2) | ||
50 | AC_MSG_RESULT(2.2 family) | ||
51 | AC_DEFINE([GLIBC_2_2], 1, [Define to 1 if you're using glibc 2.2.x]) | ||
52 | - DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" | ||
53 | - DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
54 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
55 | + DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" | ||
56 | + DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
57 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
58 | ;; | ||
59 | |||
60 | 2.3) | ||
61 | AC_MSG_RESULT(2.3 family) | ||
62 | AC_DEFINE([GLIBC_2_3], 1, [Define to 1 if you're using glibc 2.3.x]) | ||
63 | - DEFAULT_SUPP="glibc-2.3.supp ${DEFAULT_SUPP}" | ||
64 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
65 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
66 | + DEFAULT_SUPP="$srcdir/glibc-2.3.supp ${DEFAULT_SUPP}" | ||
67 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
68 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
69 | ;; | ||
70 | |||
71 | 2.4) | ||
72 | AC_MSG_RESULT(2.4 family) | ||
73 | AC_DEFINE([GLIBC_2_4], 1, [Define to 1 if you're using glibc 2.4.x]) | ||
74 | - DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}" | ||
75 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
76 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
77 | + DEFAULT_SUPP="$srcdir/glibc-2.4.supp ${DEFAULT_SUPP}" | ||
78 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
79 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
80 | ;; | ||
81 | |||
82 | 2.5) | ||
83 | AC_MSG_RESULT(2.5 family) | ||
84 | AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x]) | ||
85 | - DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}" | ||
86 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
87 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
88 | + DEFAULT_SUPP="$srcdir/glibc-2.5.supp ${DEFAULT_SUPP}" | ||
89 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
90 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
91 | ;; | ||
92 | 2.6) | ||
93 | AC_MSG_RESULT(2.6 family) | ||
94 | AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x]) | ||
95 | - DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}" | ||
96 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
97 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
98 | + DEFAULT_SUPP="$srcdir/glibc-2.6.supp ${DEFAULT_SUPP}" | ||
99 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
100 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
101 | ;; | ||
102 | 2.7) | ||
103 | AC_MSG_RESULT(2.7 family) | ||
104 | AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x]) | ||
105 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
106 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
107 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
108 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
109 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
110 | ;; | ||
111 | 2.8) | ||
112 | AC_MSG_RESULT(2.8 family) | ||
113 | AC_DEFINE([GLIBC_2_8], 1, [Define to 1 if you're using glibc 2.8.x]) | ||
114 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
115 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
116 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
117 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
118 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
119 | ;; | ||
120 | 2.9) | ||
121 | AC_MSG_RESULT(2.9 family) | ||
122 | AC_DEFINE([GLIBC_2_9], 1, [Define to 1 if you're using glibc 2.9.x]) | ||
123 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
124 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
125 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
126 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
127 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
128 | ;; | ||
129 | 2.10) | ||
130 | AC_MSG_RESULT(2.10 family) | ||
131 | AC_DEFINE([GLIBC_2_10], 1, [Define to 1 if you're using glibc 2.10.x]) | ||
132 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
133 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
134 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
135 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
136 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
137 | ;; | ||
138 | 2.11) | ||
139 | AC_MSG_RESULT(2.11 family) | ||
140 | AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x]) | ||
141 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
142 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
143 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
144 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
145 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
146 | ;; | ||
147 | 2.12) | ||
148 | AC_MSG_RESULT(2.12 family) | ||
149 | AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x]) | ||
150 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
151 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
152 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
153 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
154 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
155 | ;; | ||
156 | 2.13) | ||
157 | AC_MSG_RESULT(2.13 family) | ||
158 | AC_DEFINE([GLIBC_2_13], 1, [Define to 1 if you're using glibc 2.13.x]) | ||
159 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
160 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
161 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
162 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
163 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
164 | ;; | ||
165 | 2.14) | ||
166 | AC_MSG_RESULT(2.14 family) | ||
167 | AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x]) | ||
168 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
169 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
170 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
171 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
172 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
173 | ;; | ||
174 | 2.15) | ||
175 | AC_MSG_RESULT(2.15 family) | ||
176 | AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) | ||
177 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
178 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
179 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
180 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
181 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
182 | ;; | ||
183 | 2.16) | ||
184 | AC_MSG_RESULT(2.16 family) | ||
185 | AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x]) | ||
186 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
187 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
188 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
189 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
190 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
191 | ;; | ||
192 | 2.16) | ||
193 | AC_MSG_RESULT(2.16 family) | ||
194 | AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x]) | ||
195 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
196 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
197 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
198 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
199 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
200 | ;; | ||
201 | 2.17) | ||
202 | AC_MSG_RESULT(2.17 family) | ||
203 | AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) | ||
204 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
205 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
206 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
207 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
208 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
209 | ;; | ||
210 | darwin) | ||
211 | AC_MSG_RESULT(Darwin) | ||
212 | @@ -932,7 +932,7 @@ | ||
213 | bionic) | ||
214 | AC_MSG_RESULT(Bionic) | ||
215 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) | ||
216 | - DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" | ||
217 | + DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}" | ||
218 | ;; | ||
219 | |||
220 | *) | ||
221 | @@ -949,11 +949,11 @@ | ||
222 | # attempt to detect whether such libraries are installed on the | ||
223 | # build machine (or even if any X facilities are present); just | ||
224 | # add the suppressions antidisirregardless. | ||
225 | -DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}" | ||
226 | -DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" | ||
227 | +DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" | ||
228 | +DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" | ||
229 | |||
230 | # Add glibc and X11 suppressions for exp-sgcheck | ||
231 | -DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
232 | +DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
233 | |||
234 | |||
235 | #---------------------------------------------------------------------------- | ||