[oe-commits] Martin Jansa : valgrind: add glibc-2.21 to glibc.patch

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 68ccb00b024efccb70efffc80a57b819f10a95e0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=68ccb00b024efccb70efffc80a57b819f10a95e0

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Tue Feb 17 20:02:27 2015 +0100

valgrind: add glibc-2.21 to glibc.patch

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../valgrind/valgrind/{glibc-2.20.patch => glibc.patch}       | 11 +++++++++--
 meta/recipes-devtools/valgrind/valgrind_3.10.1.bb             |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch b/meta/recipes-devtools/valgrind/valgrind/glibc.patch
similarity index 71%
rename from meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch
rename to meta/recipes-devtools/valgrind/valgrind/glibc.patch
index fab4044..8b902dd 100644
--- a/meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/glibc.patch
@@ -1,4 +1,4 @@
-Backport of glibc 2.19 and 2.20 support.
+Backport of glibc 2.19 and 2.20 and 2.21 support.
 
 Upstream-Status: Backport
 Signed-off-by: Ross Burton <ross.burton at intel.com>
@@ -7,7 +7,7 @@ diff --git a/configure.ac b/configure.ac
 index 229ab98..1c18108 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -918,6 +918,20 @@ case "${GLIBC_VERSION}" in
+@@ -918,6 +918,27 @@ case "${GLIBC_VERSION}" in
  	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  	;;
@@ -25,6 +25,13 @@ index 229ab98..1c18108 100644
 +	DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
 +	DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
 +	;;
++     2.21)
++	AC_MSG_RESULT(2.21 family)
++	AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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.10.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
index 7d02b9f..1c2ac61 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
@@ -16,7 +16,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.20.patch \
+           file://glibc.patch \
            file://force-nostabs.patch \
            file://remove-arm-variant-specific.patch \
            file://remove-ppc-tests-failing-build.patch \