From 8f916dcb395fe5a2429f2867ba4daf8ef3af073a Mon Sep 17 00:00:00 2001
|
From: Randy MacLeod <Randy.MacLeod@windriver.com>
|
Date: Tue, 16 Oct 2018 21:01:04 -0400
|
Subject: [PATCH] Fix out of tree builds.
|
|
The paths to these files need to be fully specified in
|
the out of tree build case. glibc-2.X.supp is a generated file so the
|
full path
|
is deliberately not specified in that case.
|
|
RP 2013/03/23
|
|
Patch refreshed for valgrind-3.14.0.
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
|
---
|
configure.ac | 66 ++++++++++++++++++++++++++--------------------------
|
1 file changed, 33 insertions(+), 33 deletions(-)
|
|
diff --git a/configure.ac b/configure.ac
|
index 524230d..54861c5 100755
|
--- a/configure.ac
|
+++ b/configure.ac
|
@@ -396,50 +396,50 @@ case "${host_os}" in
|
9.*)
|
AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}"
|
;;
|
10.*)
|
AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
|
;;
|
11.*)
|
AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
|
;;
|
12.*)
|
AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
|
;;
|
13.*)
|
AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
|
;;
|
14.*)
|
AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
|
;;
|
15.*)
|
AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
|
;;
|
16.*)
|
AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra])
|
AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version])
|
- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
|
;;
|
17.*)
|
AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra])
|
@@ -464,7 +464,7 @@ case "${host_os}" in
|
DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
|
;;
|
*)
|
- DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}"
|
;;
|
esac
|
;;
|
@@ -472,7 +472,7 @@ case "${host_os}" in
|
solaris2.12*)
|
AC_MSG_RESULT([ok (${host_os})])
|
VGCONF_OS="solaris"
|
- DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}"
|
;;
|
|
*)
|
@@ -1095,29 +1095,29 @@ AC_MSG_CHECKING([the glibc version])
|
case "${GLIBC_VERSION}" in
|
2.2)
|
AC_MSG_RESULT(${GLIBC_VERSION} family)
|
- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
;;
|
2.[[3-6]])
|
AC_MSG_RESULT(${GLIBC_VERSION} family)
|
- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
;;
|
2.[[7-9]])
|
AC_MSG_RESULT(${GLIBC_VERSION} family)
|
DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
;;
|
2.10|2.11)
|
AC_MSG_RESULT(${GLIBC_VERSION} family)
|
AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1,
|
[Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)])
|
DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
;;
|
2.*)
|
AC_MSG_RESULT(${GLIBC_VERSION} family)
|
@@ -1126,8 +1126,8 @@ case "${GLIBC_VERSION}" in
|
AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1,
|
[Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)])
|
DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
|
;;
|
darwin)
|
AC_MSG_RESULT(Darwin)
|
@@ -1137,7 +1137,7 @@ case "${GLIBC_VERSION}" in
|
bionic)
|
AC_MSG_RESULT(Bionic)
|
AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
|
- DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}"
|
;;
|
solaris)
|
AC_MSG_RESULT(Solaris)
|
@@ -1164,8 +1164,8 @@ if test "$VGCONF_OS" != "solaris"; then
|
# attempt to detect whether such libraries are installed on the
|
# build machine (or even if any X facilities are present); just
|
# add the suppressions antidisirregardless.
|
- DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}"
|
- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}"
|
+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}"
|
fi
|
|
|
--
|
2.17.1
|
