1 From 739421e253e6eba3eb6438651822f80fa9c0502a 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.
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.
12 Upstream-Status: Pending
13 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
16 configure.ac | 68 ++++++++++++++++++++++++++++++------------------------------
17 1 file changed, 34 insertions(+), 34 deletions(-)
19 diff --git a/configure.ac b/configure.ac
20 index 3874296fde0b..7a5ba2c8557e 100644
23 @@ -373,50 +373,50 @@ case "${host_os}" in
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}"
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}"
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}"
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}"
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}"
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}"
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}"
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}"
89 AC_MSG_RESULT([unsupported (${kernel})])
90 @@ -457,10 +457,10 @@ case "${host_os}" in
94 - DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
95 + DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}"
98 - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}"
99 + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}"
103 @@ -468,7 +468,7 @@ case "${host_os}" in
105 AC_MSG_RESULT([ok (${host_os})])
107 - DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
108 + DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}"
112 @@ -982,29 +982,29 @@ AC_MSG_CHECKING([the glibc version])
113 case "${GLIBC_VERSION}" in
115 AC_MSG_RESULT(${GLIBC_VERSION} family)
116 - DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}"
117 - DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
118 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
119 + DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}"
120 + DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
121 + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
124 AC_MSG_RESULT(${GLIBC_VERSION} family)
125 - DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
126 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
127 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
128 + DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
129 + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
130 + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
133 AC_MSG_RESULT(${GLIBC_VERSION} family)
134 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
135 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
136 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
137 + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
138 + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
141 AC_MSG_RESULT(${GLIBC_VERSION} family)
142 AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1,
143 [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)])
144 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
145 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
146 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
147 + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
148 + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
151 AC_MSG_RESULT(${GLIBC_VERSION} family)
152 @@ -1013,8 +1013,8 @@ case "${GLIBC_VERSION}" in
153 AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1,
154 [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)])
155 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
156 - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
157 - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
158 + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
159 + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
162 AC_MSG_RESULT(Darwin)
163 @@ -1024,7 +1024,7 @@ case "${GLIBC_VERSION}" in
165 AC_MSG_RESULT(Bionic)
166 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
167 - DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}"
168 + DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}"
171 AC_MSG_RESULT(Solaris)
172 @@ -1051,11 +1051,11 @@ if test "$VGCONF_OS" != "solaris"; then
173 # attempt to detect whether such libraries are installed on the
174 # build machine (or even if any X facilities are present); just
175 # add the suppressions antidisirregardless.
176 - DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}"
177 - DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
178 + DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}"
179 + DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}"
181 # Add glibc and X11 suppressions for exp-sgcheck
182 - DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}"
183 + DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}"