Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 8f916dcb395fe5a2429f2867ba4daf8ef3af073a Mon Sep 17 00:00:00 2001 |
| 2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> |
| 3 | Date: Tue, 16 Oct 2018 21:01:04 -0400 |
| 4 | Subject: [PATCH] Fix out of tree builds. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | |
| 6 | The paths to these files need to be fully specified in |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 7 | the out of tree build case. glibc-2.X.supp is a generated file so the |
| 8 | full path |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9 | is deliberately not specified in that case. |
| 10 | |
| 11 | RP 2013/03/23 |
| 12 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 13 | Patch refreshed for valgrind-3.14.0. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 14 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 15 | Upstream-Status: Pending |
| 16 | |
| 17 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 18 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | --- |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 20 | configure.ac | 66 ++++++++++++++++++++++++++-------------------------- |
| 21 | 1 file changed, 33 insertions(+), 33 deletions(-) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 22 | |
| 23 | diff --git a/configure.ac b/configure.ac |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 24 | index 524230d..54861c5 100755 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 25 | --- a/configure.ac |
| 26 | +++ b/configure.ac |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 27 | @@ -396,50 +396,50 @@ case "${host_os}" in |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 28 | 9.*) |
| 29 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) |
| 30 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) |
| 31 | - DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" |
| 32 | - DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 33 | + DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" |
| 34 | + DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 35 | ;; |
| 36 | 10.*) |
| 37 | AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) |
| 38 | AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) |
| 39 | - DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" |
| 40 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 41 | + DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" |
| 42 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 43 | ;; |
| 44 | 11.*) |
| 45 | AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) |
| 46 | AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) |
| 47 | - DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" |
| 48 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 49 | + DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" |
| 50 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 51 | ;; |
| 52 | 12.*) |
| 53 | AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) |
| 54 | AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) |
| 55 | - DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" |
| 56 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 57 | + DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" |
| 58 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 59 | ;; |
| 60 | 13.*) |
| 61 | AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) |
| 62 | AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) |
| 63 | - DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" |
| 64 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 65 | + DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" |
| 66 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 67 | ;; |
| 68 | 14.*) |
| 69 | AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) |
| 70 | AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) |
| 71 | - DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" |
| 72 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 73 | + DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" |
| 74 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 75 | ;; |
| 76 | 15.*) |
| 77 | AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) |
| 78 | AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) |
| 79 | - DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" |
| 80 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 81 | + DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" |
| 82 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 83 | ;; |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 84 | 16.*) |
| 85 | AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra]) |
| 86 | AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version]) |
| 87 | - DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}" |
| 88 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 89 | + DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" |
| 90 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 91 | ;; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 92 | 17.*) |
| 93 | AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 94 | @@ -464,7 +464,7 @@ case "${host_os}" in |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 95 | DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" |
| 96 | ;; |
| 97 | *) |
| 98 | - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" |
| 99 | + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" |
| 100 | ;; |
| 101 | esac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 102 | ;; |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 103 | @@ -472,7 +472,7 @@ case "${host_os}" in |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 104 | solaris2.12*) |
| 105 | AC_MSG_RESULT([ok (${host_os})]) |
| 106 | VGCONF_OS="solaris" |
| 107 | - DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" |
| 108 | + DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}" |
| 109 | ;; |
| 110 | |
| 111 | *) |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 112 | @@ -1095,29 +1095,29 @@ AC_MSG_CHECKING([the glibc version]) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 113 | case "${GLIBC_VERSION}" in |
| 114 | 2.2) |
| 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}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 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}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 122 | ;; |
| 123 | 2.[[3-6]]) |
| 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}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 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}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 131 | ;; |
| 132 | 2.[[7-9]]) |
| 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}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 137 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 138 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 139 | ;; |
| 140 | 2.10|2.11) |
| 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}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 147 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 148 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 149 | ;; |
| 150 | 2.*) |
| 151 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 152 | @@ -1126,8 +1126,8 @@ case "${GLIBC_VERSION}" in |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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}" |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 158 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 159 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 160 | ;; |
| 161 | darwin) |
| 162 | AC_MSG_RESULT(Darwin) |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 163 | @@ -1137,7 +1137,7 @@ case "${GLIBC_VERSION}" in |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 164 | bionic) |
| 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}" |
| 169 | ;; |
| 170 | solaris) |
| 171 | AC_MSG_RESULT(Solaris) |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 172 | @@ -1164,8 +1164,8 @@ if test "$VGCONF_OS" != "solaris"; then |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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}" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 180 | fi |
| 181 | |
| 182 | |
| 183 | -- |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 184 | 2.17.1 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 185 | |