valgrind: Fix out of tree builds
(From OE-Core rev: 1944d362866fef1af406ed50955f1ed7cd9c29a8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
554e3d2540
commit
e6dad38c65
|
@ -0,0 +1,235 @@
|
|||
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
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: valgrind-3.8.1/configure.in
|
||||
===================================================================
|
||||
--- valgrind-3.8.1.orig/configure.in 2013-03-23 16:06:58.388793432 +0000
|
||||
+++ valgrind-3.8.1/configure.in 2013-03-23 16:46:15.088737377 +0000
|
||||
@@ -316,26 +316,26 @@
|
||||
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}"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT([unsupported (${kernel})])
|
||||
@@ -805,124 +805,124 @@
|
||||
2.2)
|
||||
AC_MSG_RESULT(2.2 family)
|
||||
AC_DEFINE([GLIBC_2_2], 1, [Define to 1 if you're using glibc 2.2.x])
|
||||
- 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)
|
||||
AC_MSG_RESULT(2.3 family)
|
||||
AC_DEFINE([GLIBC_2_3], 1, [Define to 1 if you're using glibc 2.3.x])
|
||||
- DEFAULT_SUPP="glibc-2.3.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.3.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.4)
|
||||
AC_MSG_RESULT(2.4 family)
|
||||
AC_DEFINE([GLIBC_2_4], 1, [Define to 1 if you're using glibc 2.4.x])
|
||||
- DEFAULT_SUPP="glibc-2.4.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.4.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.5)
|
||||
AC_MSG_RESULT(2.5 family)
|
||||
AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
|
||||
- DEFAULT_SUPP="glibc-2.5.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.5.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.6)
|
||||
AC_MSG_RESULT(2.6 family)
|
||||
AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x])
|
||||
- DEFAULT_SUPP="glibc-2.6.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.6.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)
|
||||
AC_MSG_RESULT(2.7 family)
|
||||
AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x])
|
||||
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.8)
|
||||
AC_MSG_RESULT(2.8 family)
|
||||
AC_DEFINE([GLIBC_2_8], 1, [Define to 1 if you're using glibc 2.8.x])
|
||||
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.9)
|
||||
AC_MSG_RESULT(2.9 family)
|
||||
AC_DEFINE([GLIBC_2_9], 1, [Define to 1 if you're using glibc 2.9.x])
|
||||
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)
|
||||
AC_MSG_RESULT(2.10 family)
|
||||
AC_DEFINE([GLIBC_2_10], 1, [Define to 1 if you're using glibc 2.10.x])
|
||||
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.11)
|
||||
AC_MSG_RESULT(2.11 family)
|
||||
AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x])
|
||||
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.12)
|
||||
AC_MSG_RESULT(2.12 family)
|
||||
AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x])
|
||||
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.13)
|
||||
AC_MSG_RESULT(2.13 family)
|
||||
AC_DEFINE([GLIBC_2_13], 1, [Define to 1 if you're using glibc 2.13.x])
|
||||
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.14)
|
||||
AC_MSG_RESULT(2.14 family)
|
||||
AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x])
|
||||
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.15)
|
||||
AC_MSG_RESULT(2.15 family)
|
||||
AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
|
||||
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.16)
|
||||
AC_MSG_RESULT(2.16 family)
|
||||
AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x])
|
||||
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.16)
|
||||
AC_MSG_RESULT(2.16 family)
|
||||
AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x])
|
||||
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.17)
|
||||
AC_MSG_RESULT(2.17 family)
|
||||
AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
|
||||
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)
|
||||
@@ -932,7 +932,7 @@
|
||||
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}"
|
||||
;;
|
||||
|
||||
*)
|
||||
@@ -949,11 +949,11 @@
|
||||
# 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}"
|
||||
|
||||
# Add glibc and X11 suppressions for exp-sgcheck
|
||||
-DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}"
|
||||
+DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}"
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------
|
|
@ -17,6 +17,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
|
|||
file://fixed-perl-path.patch \
|
||||
file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
|
||||
file://configure-with-newer-glibc.patch \
|
||||
file://sepbuildfix.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "288758010b271119a0ffc0183f1d6e38"
|
||||
|
|
Loading…
Reference in New Issue