valgrind: Fix build with eglibc 2.16

(From OE-Core rev: 5a59bf0778608b7c5e1073bf38d36b98d831db0d)

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

2 files changed, 35 insertions, 1 deletions

diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-glibc-2.16.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-glibc-2.16.patch
new file mode 100644
index 0000000000..c622637d2d
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-glibc-2.16.patch
@@ -0,0 +1,32 @@
+Add case for glibc 2.16 and correct error message to denote support until 2.16
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: valgrind-3.7.0/configure.in
+===================================================================
+--- valgrind-3.7.0.orig/configure.in    2012-07-04 12:57:10.557192441 -0700
++++ valgrind-3.7.0/configure.in 2012-07-04 12:57:58.785194776 -0700
+@@ -788,6 +788,13 @@
+        DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+        DEFAULT_SUPP="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}"
++       ;;
+      darwin)
+        AC_MSG_RESULT(Darwin)
+        AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -801,7 +808,7 @@
+ 
+      *)
+        AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-       AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
++       AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
+        AC_MSG_ERROR([or Darwin libc])
+        ;;
+ esac
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index bb954bdaf7..abda7a6c90 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -17,7 +17,9 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
            file://fixed-perl-path.patch \
            file://fix_for_automake_1.11.2.patch \
            file://configure-fix.patch \
-           file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch"
+           file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
+           file://configure-with-glibc-2.16.patch \
+          "
 
 SRC_URI[md5sum] = "a855fda56edf05614f099dca316d1775"
 SRC_URI[sha256sum] = "5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6"