1From 59e3190e9121c5439d54298b083b44c5c3794a7f Mon Sep 17 00:00:00 2001 2From: Randy MacLeod <Randy.MacLeod@windriver.com> 3Date: Tue, 16 Oct 2018 21:01:04 -0400 4Subject: [PATCH] Fix out of tree builds. 5 6The paths to these files need to be fully specified in 7the out of tree build case. glibc-2.X.supp is a generated file so the 8full path 9is deliberately not specified in that case. 10 11RP 2013/03/23 12 13Patch refreshed for valgrind-3.14.0. 14 15Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=445211] 16 17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 18Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 19 20--- 21 configure.ac | 62 ++++++++++++++++++++++++++-------------------------- 22 1 file changed, 31 insertions(+), 31 deletions(-) 23 24diff --git a/configure.ac b/configure.ac 25index b851798..d360896 100755 26--- a/configure.ac 27+++ b/configure.ac 28@@ -447,50 +447,50 @@ case "${host_os}" in 29 9.*) 30 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) 31 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) 32- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" 33- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" 34+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" 35+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" 36 ;; 37 10.*) 38 AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) 39 AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) 40- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" 41- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 42+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" 43+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 44 ;; 45 11.*) 46 AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) 47 AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) 48- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" 49- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 50+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" 51+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 52 ;; 53 12.*) 54 AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) 55 AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) 56- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" 57- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 58+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" 59+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 60 ;; 61 13.*) 62 AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) 63 AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) 64- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" 65- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 66+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" 67+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 68 ;; 69 14.*) 70 AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) 71 AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) 72- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" 73- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 74+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" 75+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 76 ;; 77 15.*) 78 AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) 79 AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) 80- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" 81- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 82+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" 83+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 84 ;; 85 16.*) 86 AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra]) 87 AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version]) 88- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}" 89- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 90+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" 91+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 92 ;; 93 17.*) 94 AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) 95@@ -515,7 +515,7 @@ case "${host_os}" in 96 DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" 97 ;; 98 *) 99- DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" 100+ DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" 101 ;; 102 esac 103 ;; 104@@ -523,7 +523,7 @@ case "${host_os}" in 105 solaris2.12*) 106 AC_MSG_RESULT([ok (${host_os})]) 107 VGCONF_OS="solaris" 108- DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" 109+ DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}" 110 ;; 111 112 *) 113@@ -1237,15 +1237,15 @@ AC_MSG_CHECKING([the glibc version]) 114 case "${GLIBC_VERSION}" in 115 2.2) 116 AC_MSG_RESULT(${GLIBC_VERSION} family) 117- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" 118- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" 119- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 120+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" 121+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" 122+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 123 ;; 124 2.[[3-6]]) 125 AC_MSG_RESULT(${GLIBC_VERSION} family) 126- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" 127- DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" 128- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 129+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" 130+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" 131+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 132 ;; 133 2.[[7-9]]) 134 AC_MSG_RESULT(${GLIBC_VERSION} family) 135@@ -1258,8 +1258,8 @@ case "${GLIBC_VERSION}" in 136 AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1, 137 [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)]) 138 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 139- DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" 140- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 141+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" 142+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 143 ;; 144 2.*) 145 AC_MSG_RESULT(${GLIBC_VERSION} family) 146@@ -1268,8 +1268,8 @@ case "${GLIBC_VERSION}" in 147 AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, 148 [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) 149 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 150- DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" 151- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 152+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" 153+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 154 ;; 155 darwin) 156 AC_MSG_RESULT(Darwin) 157@@ -1284,7 +1284,7 @@ case "${GLIBC_VERSION}" in 158 bionic) 159 AC_MSG_RESULT(Bionic) 160 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) 161- DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" 162+ DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}" 163 ;; 164 solaris) 165 AC_MSG_RESULT(Solaris) 166@@ -1313,8 +1313,8 @@ if test "$VGCONF_OS" != "solaris"; then 167 # attempt to detect whether such libraries are installed on the 168 # build machine (or even if any X facilities are present); just 169 # add the suppressions antidisirregardless. 170- DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}" 171- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" 172+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" 173+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" 174 fi 175 176 177