valgrind: Backport patch for eglibc 2.18

(From OE-Core rev: 7005f1cd52d64a96a252becd5b1ee7bb5c79ca1a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 28 insertions, 0 deletions

diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
new file mode 100644
index 0000000000..1fa8127302
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
@@ -0,0 +1,27 @@
+
+
+Found in the SVN valgrind code
+svn diff -c 13504 configure.in 
+
+Upstream-Status: Backport
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: valgrind-3.8.1/configure.in
+===================================================================
+--- valgrind-3.8.1.orig/configure.in
++++ valgrind-3.8.1/configure.in
+@@ -924,6 +924,13 @@ case "${GLIBC_VERSION}" in
+        DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        ;;
++     2.18)
++       AC_MSG_RESULT(2.18 family)
++       AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.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)
+        AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
index 33f178c2a1..9630960fee 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
@@ -18,6 +18,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
            file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
            file://configure-with-newer-glibc.patch \
            file://sepbuildfix.patch \
+           file://eglibc-2.18.patch \
           "
 
 SRC_URI[md5sum] = "288758010b271119a0ffc0183f1d6e38"