2 files changed, 24 insertions, 0 deletions

diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch b/meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch
new file mode 100644
index 0000000000..7714b997fe
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch
@@ -0,0 +1,23 @@
+Add support for compiling with glibc 2.19
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: valgrind-3.9.0/configure.ac
+===================================================================
+--- valgrind-3.9.0.orig/configure.ac    2014-02-12 09:03:07.879873700 -0800
++++ valgrind-3.9.0/configure.ac 2014-02-12 09:07:35.099871774 -0800
+@@ -918,6 +918,13 @@
+        DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+        ;;
++     2.19)
++       AC_MSG_RESULT(2.19 family)
++       AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.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.9.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
index e1fb568d4c..64da1a2808 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
@@ -15,6 +15,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://sepbuildfix.patch \
+           file://glibc-2.19.patch \
           "
 
 SRC_URI[md5sum] = "0947de8112f946b9ce64764af7be6df2"