From addc26fb193d3fd259f10aaaae3b0de2f21c81f5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 11 Aug 2015 14:36:24 -0700 Subject: valgrind: Fix build with glibc 2.22 Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- meta/recipes-devtools/valgrind/valgrind/glibc.patch | 17 ++++++++++++----- 1 file 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. Upstream-Status: Backport Signed-off-by: Ross Burton -diff --git a/configure.ac b/configure.ac -index 229ab98..1c18108 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -918,6 +918,27 @@ case "${GLIBC_VERSION}" in +Index: valgrind-3.10.1/configure.ac +=================================================================== +--- valgrind-3.10.1.orig/configure.ac ++++ valgrind-3.10.1/configure.ac +@@ -1018,6 +1018,34 @@ case "${GLIBC_VERSION}" in DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; @@ -31,6 +31,13 @@ index 229ab98..1c18108 100644 + DEFAULT_SUPP="glibc-2.X.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.22) ++ AC_MSG_RESULT(2.22 family) ++ AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.x]) ++ DEFAULT_SUPP="glibc-2.X.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) -- cgit 1.2.3-korg