summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-11 14:36:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-16 09:24:56 +0100
commitf535efb8653953fdbb4cb508e14cb4c267053590 (patch)
treecb13a6fd5eeb08830f6d6b9126efaeadfc24cc70 /meta/recipes-devtools
parent0e05155fdfd6202d820d2b84e2242b339ffc64bf (diff)
downloadpoky-f535efb8653953fdbb4cb508e14cb4c267053590.tar.gz
valgrind: Fix build with glibc 2.22
(From OE-Core rev: addc26fb193d3fd259f10aaaae3b0de2f21c81f5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/glibc.patch17
1 files changed, 12 insertions, 5 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc.patch b/meta/recipes-devtools/valgrind/valgrind/glibc.patch
index 8b902ddbff..863499d69d 100644
--- a/meta/recipes-devtools/valgrind/valgrind/glibc.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/glibc.patch
@@ -3,11 +3,11 @@ Backport of glibc 2.19 and 2.20 and 2.21 support.
3Upstream-Status: Backport 3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com> 4Signed-off-by: Ross Burton <ross.burton@intel.com>
5 5
6diff --git a/configure.ac b/configure.ac 6Index: valgrind-3.10.1/configure.ac
7index 229ab98..1c18108 100644 7===================================================================
8--- a/configure.ac 8--- valgrind-3.10.1.orig/configure.ac
9+++ b/configure.ac 9+++ valgrind-3.10.1/configure.ac
10@@ -918,6 +918,27 @@ case "${GLIBC_VERSION}" in 10@@ -1018,6 +1018,34 @@ case "${GLIBC_VERSION}" in
11 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 11 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
12 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 12 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
13 ;; 13 ;;
@@ -32,6 +32,13 @@ index 229ab98..1c18108 100644
32+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 32+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
33+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 33+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
34+ ;; 34+ ;;
35+ 2.22)
36+ AC_MSG_RESULT(2.22 family)
37+ AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.x])
38+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
39+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
40+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
41+ ;;
35 darwin) 42 darwin)
36 AC_MSG_RESULT(Darwin) 43 AC_MSG_RESULT(Darwin)
37 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) 44 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])