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 | 175 |
1 files changed, 175 insertions, 0 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 new file mode 100644 index 0000000000..ed313d6444 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch | |||
@@ -0,0 +1,175 @@ | |||
1 | From 38ae233b6893a4eec7f9ed6d8ad02392bca8eaed Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 15 Dec 2015 15:31:50 +0200 | ||
4 | Subject: [PATCH 1/2] Fix out of tree builds. | ||
5 | |||
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 | ||
8 | is deliberately not specified in that case. | ||
9 | |||
10 | RP 2013/03/23 | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | |||
15 | --- | ||
16 | configure.ac | 64 ++++++++++++++++++++++++++++++------------------------------ | ||
17 | 1 file changed, 32 insertions(+), 32 deletions(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 8ab7f9b..9366dc7 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -377,44 +377,44 @@ case "${host_os}" in | ||
24 | 9.*) | ||
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]) | ||
27 | - DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" | ||
28 | - DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" | ||
29 | + DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" | ||
30 | + DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" | ||
31 | ;; | ||
32 | 10.*) | ||
33 | AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) | ||
34 | AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) | ||
35 | - DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" | ||
36 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
37 | + DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" | ||
38 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
39 | ;; | ||
40 | 11.*) | ||
41 | AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) | ||
42 | AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) | ||
43 | - DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" | ||
44 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
45 | + DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" | ||
46 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
47 | ;; | ||
48 | 12.*) | ||
49 | AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) | ||
50 | AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) | ||
51 | - DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" | ||
52 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
53 | + DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" | ||
54 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
55 | ;; | ||
56 | 13.*) | ||
57 | AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) | ||
58 | AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) | ||
59 | - DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" | ||
60 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
61 | + DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" | ||
62 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
63 | ;; | ||
64 | 14.*) | ||
65 | AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) | ||
66 | AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) | ||
67 | - DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" | ||
68 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
69 | + DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" | ||
70 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
71 | ;; | ||
72 | 15.*) | ||
73 | AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) | ||
74 | AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) | ||
75 | - DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" | ||
76 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
77 | + DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" | ||
78 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
79 | ;; | ||
80 | *) | ||
81 | AC_MSG_RESULT([unsupported (${kernel})]) | ||
82 | @@ -426,13 +426,13 @@ case "${host_os}" in | ||
83 | solaris2.11*) | ||
84 | AC_MSG_RESULT([ok (${host_os})]) | ||
85 | VGCONF_OS="solaris" | ||
86 | - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" | ||
87 | + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" | ||
88 | ;; | ||
89 | |||
90 | solaris2.12*) | ||
91 | AC_MSG_RESULT([ok (${host_os})]) | ||
92 | VGCONF_OS="solaris" | ||
93 | - DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" | ||
94 | + DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}" | ||
95 | ;; | ||
96 | |||
97 | *) | ||
98 | @@ -1015,29 +1015,29 @@ AC_MSG_CHECKING([the glibc version]) | ||
99 | case "${GLIBC_VERSION}" in | ||
100 | 2.2) | ||
101 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
102 | - DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" | ||
103 | - DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
104 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
105 | + DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" | ||
106 | + DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
107 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
108 | ;; | ||
109 | 2.[[3-6]]) | ||
110 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
111 | - DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" | ||
112 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
113 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
114 | + DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" | ||
115 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
116 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
117 | ;; | ||
118 | 2.[[7-9]]) | ||
119 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
120 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
121 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
122 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
123 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
124 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
125 | ;; | ||
126 | 2.10|2.11) | ||
127 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
128 | AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1, | ||
129 | [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)]) | ||
130 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
131 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
132 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
133 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
134 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
135 | ;; | ||
136 | 2.*) | ||
137 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
138 | @@ -1046,8 +1046,8 @@ case "${GLIBC_VERSION}" in | ||
139 | 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)]) | ||
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 | darwin) | ||
148 | AC_MSG_RESULT(Darwin) | ||
149 | @@ -1057,7 +1057,7 @@ case "${GLIBC_VERSION}" in | ||
150 | bionic) | ||
151 | AC_MSG_RESULT(Bionic) | ||
152 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) | ||
153 | - DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" | ||
154 | + DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}" | ||
155 | ;; | ||
156 | solaris) | ||
157 | AC_MSG_RESULT(Solaris) | ||
158 | @@ -1079,11 +1079,11 @@ if test "$VGCONF_OS" != "solaris"; then | ||
159 | # attempt to detect whether such libraries are installed on the | ||
160 | # build machine (or even if any X facilities are present); just | ||
161 | # add the suppressions antidisirregardless. | ||
162 | - DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}" | ||
163 | - DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" | ||
164 | + DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" | ||
165 | + DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" | ||
166 | |||
167 | # Add glibc and X11 suppressions for exp-sgcheck | ||
168 | - DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
169 | + DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
170 | fi | ||
171 | |||
172 | |||
173 | -- | ||
174 | 2.6.2 | ||
175 | |||