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 | 85 |
1 files changed, 41 insertions, 44 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 75bb0aa7cb..4570f63995 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 | |||
@@ -4,7 +4,8 @@ Date: Tue, 16 Oct 2018 21:01:04 -0400 | |||
4 | Subject: [PATCH] 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 |
8 | full path | ||
8 | is deliberately not specified in that case. | 9 | is deliberately not specified in that case. |
9 | 10 | ||
10 | RP 2013/03/23 | 11 | RP 2013/03/23 |
@@ -16,81 +17,81 @@ Upstream-Status: Pending | |||
16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 17 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
17 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | 18 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
18 | --- | 19 | --- |
19 | configure.ac | 68 ++++++++++++++++++++++++++-------------------------- | 20 | configure.ac | 66 ++++++++++++++++++++++++++-------------------------- |
20 | 1 file changed, 34 insertions(+), 34 deletions(-) | 21 | 1 file changed, 33 insertions(+), 33 deletions(-) |
21 | 22 | ||
22 | diff --git a/configure.ac b/configure.ac | 23 | diff --git a/configure.ac b/configure.ac |
23 | index c18ae5f2a..99667ce57 100644 | 24 | index 524230d..54861c5 100755 |
24 | --- a/configure.ac | 25 | --- a/configure.ac |
25 | +++ b/configure.ac | 26 | +++ b/configure.ac |
26 | @@ -392,50 +392,50 @@ case "${host_os}" in | 27 | @@ -396,50 +396,50 @@ case "${host_os}" in |
27 | 9.*) | 28 | 9.*) |
28 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) | 29 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) |
29 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) | 30 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) |
30 | - DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" | 31 | - DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" |
31 | - DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" | 32 | - DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" |
32 | + DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" | 33 | + DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" |
33 | + DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" | 34 | + DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" |
34 | ;; | 35 | ;; |
35 | 10.*) | 36 | 10.*) |
36 | AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) | 37 | AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) |
37 | AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) | 38 | AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) |
38 | - DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" | 39 | - DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" |
39 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | 40 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
40 | + DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" | 41 | + DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" |
41 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 42 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
42 | ;; | 43 | ;; |
43 | 11.*) | 44 | 11.*) |
44 | AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) | 45 | AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) |
45 | AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) | 46 | AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) |
46 | - DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" | 47 | - DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" |
47 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | 48 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
48 | + DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" | 49 | + DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" |
49 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 50 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
50 | ;; | 51 | ;; |
51 | 12.*) | 52 | 12.*) |
52 | AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) | 53 | AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) |
53 | AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) | 54 | AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) |
54 | - DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" | 55 | - DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" |
55 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | 56 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
56 | + DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" | 57 | + DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" |
57 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 58 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
58 | ;; | 59 | ;; |
59 | 13.*) | 60 | 13.*) |
60 | AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) | 61 | AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) |
61 | AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) | 62 | AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) |
62 | - DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" | 63 | - DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" |
63 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | 64 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
64 | + DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" | 65 | + DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" |
65 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 66 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
66 | ;; | 67 | ;; |
67 | 14.*) | 68 | 14.*) |
68 | AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) | 69 | AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) |
69 | AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) | 70 | AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) |
70 | - DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" | 71 | - DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" |
71 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | 72 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
72 | + DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" | 73 | + DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" |
73 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 74 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
74 | ;; | 75 | ;; |
75 | 15.*) | 76 | 15.*) |
76 | AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) | 77 | AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) |
77 | AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) | 78 | AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) |
78 | - DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" | 79 | - DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" |
79 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | 80 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
80 | + DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" | 81 | + DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" |
81 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 82 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
82 | ;; | 83 | ;; |
83 | 16.*) | 84 | 16.*) |
84 | AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra]) | 85 | AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra]) |
85 | AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version]) | 86 | AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version]) |
86 | - DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}" | 87 | - DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}" |
87 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | 88 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
88 | + DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" | 89 | + DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" |
89 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 90 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
90 | ;; | 91 | ;; |
91 | 17.*) | 92 | 17.*) |
92 | AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) | 93 | AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) |
93 | @@ -460,7 +460,7 @@ case "${host_os}" in | 94 | @@ -464,7 +464,7 @@ case "${host_os}" in |
94 | DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" | 95 | DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" |
95 | ;; | 96 | ;; |
96 | *) | 97 | *) |
@@ -99,7 +100,7 @@ index c18ae5f2a..99667ce57 100644 | |||
99 | ;; | 100 | ;; |
100 | esac | 101 | esac |
101 | ;; | 102 | ;; |
102 | @@ -468,7 +468,7 @@ case "${host_os}" in | 103 | @@ -472,7 +472,7 @@ case "${host_os}" in |
103 | solaris2.12*) | 104 | solaris2.12*) |
104 | AC_MSG_RESULT([ok (${host_os})]) | 105 | AC_MSG_RESULT([ok (${host_os})]) |
105 | VGCONF_OS="solaris" | 106 | VGCONF_OS="solaris" |
@@ -108,33 +109,33 @@ index c18ae5f2a..99667ce57 100644 | |||
108 | ;; | 109 | ;; |
109 | 110 | ||
110 | *) | 111 | *) |
111 | @@ -1051,29 +1051,29 @@ AC_MSG_CHECKING([the glibc version]) | 112 | @@ -1095,29 +1095,29 @@ AC_MSG_CHECKING([the glibc version]) |
112 | case "${GLIBC_VERSION}" in | 113 | case "${GLIBC_VERSION}" in |
113 | 2.2) | 114 | 2.2) |
114 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 115 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
115 | - DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" | 116 | - DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" |
116 | - DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | 117 | - DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" |
117 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 118 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
118 | + DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" | 119 | + DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" |
119 | + DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | 120 | + DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" |
120 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 121 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
121 | ;; | 122 | ;; |
122 | 2.[[3-6]]) | 123 | 2.[[3-6]]) |
123 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 124 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
124 | - DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" | 125 | - DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" |
125 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 126 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
126 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 127 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
127 | + DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" | 128 | + DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" |
128 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 129 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
129 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 130 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
130 | ;; | 131 | ;; |
131 | 2.[[7-9]]) | 132 | 2.[[7-9]]) |
132 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 133 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
133 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | 134 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
134 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 135 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
135 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 136 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
136 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 137 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
137 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 138 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
138 | ;; | 139 | ;; |
139 | 2.10|2.11) | 140 | 2.10|2.11) |
140 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 141 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
@@ -143,23 +144,23 @@ index c18ae5f2a..99667ce57 100644 | |||
143 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | 144 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
144 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 145 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
145 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 146 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
146 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 147 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
147 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 148 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
148 | ;; | 149 | ;; |
149 | 2.*) | 150 | 2.*) |
150 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 151 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
151 | @@ -1082,8 +1082,8 @@ case "${GLIBC_VERSION}" in | 152 | @@ -1126,8 +1126,8 @@ case "${GLIBC_VERSION}" in |
152 | AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, | 153 | AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, |
153 | [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) | 154 | [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) |
154 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | 155 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
155 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 156 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
156 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 157 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
157 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 158 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
158 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 159 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
159 | ;; | 160 | ;; |
160 | darwin) | 161 | darwin) |
161 | AC_MSG_RESULT(Darwin) | 162 | AC_MSG_RESULT(Darwin) |
162 | @@ -1093,7 +1093,7 @@ case "${GLIBC_VERSION}" in | 163 | @@ -1137,7 +1137,7 @@ case "${GLIBC_VERSION}" in |
163 | bionic) | 164 | bionic) |
164 | AC_MSG_RESULT(Bionic) | 165 | AC_MSG_RESULT(Bionic) |
165 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) | 166 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) |
@@ -168,7 +169,7 @@ index c18ae5f2a..99667ce57 100644 | |||
168 | ;; | 169 | ;; |
169 | solaris) | 170 | solaris) |
170 | AC_MSG_RESULT(Solaris) | 171 | AC_MSG_RESULT(Solaris) |
171 | @@ -1120,11 +1120,11 @@ if test "$VGCONF_OS" != "solaris"; then | 172 | @@ -1164,8 +1164,8 @@ if test "$VGCONF_OS" != "solaris"; then |
172 | # attempt to detect whether such libraries are installed on the | 173 | # attempt to detect whether such libraries are installed on the |
173 | # build machine (or even if any X facilities are present); just | 174 | # build machine (or even if any X facilities are present); just |
174 | # add the suppressions antidisirregardless. | 175 | # add the suppressions antidisirregardless. |
@@ -176,13 +177,9 @@ index c18ae5f2a..99667ce57 100644 | |||
176 | - DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" | 177 | - DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" |
177 | + DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" | 178 | + DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" |
178 | + DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" | 179 | + DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" |
179 | |||
180 | # Add glibc and X11 suppressions for exp-sgcheck | ||
181 | - DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
182 | + DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
183 | fi | 180 | fi |
184 | 181 | ||
185 | 182 | ||
186 | -- | 183 | -- |
187 | 2.17.0 | 184 | 2.17.1 |
188 | 185 | ||