summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/valgrind
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-02-17 20:02:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 22:29:27 +0000
commit68ccb00b024efccb70efffc80a57b819f10a95e0 (patch)
treea62fd994bd1bf974c24a01e59e752260695dc818 /meta/recipes-devtools/valgrind
parentd98e5ec575f542b3afaabd96b07ae9a21e1c22f4 (diff)
downloadopenembedded-core-68ccb00b024efccb70efffc80a57b819f10a95e0.tar.gz
openembedded-core-68ccb00b024efccb70efffc80a57b819f10a95e0.tar.bz2
openembedded-core-68ccb00b024efccb70efffc80a57b819f10a95e0.zip
valgrind: add glibc-2.21 to glibc.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/glibc.patch (renamed from meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch)11
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.10.1.bb2
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
index fab4044d17..8b902ddbff 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@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 7d02b9f0ea..1c2ac61bbc 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 \