summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-09-09 23:29:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:33:25 +0100
commit7576bd99825a105f1bdc3efc22ed1d0e007f57cc (patch)
tree791bb12c65d0d2216905a0f18e26e135bee7aec7
parentecb4014c58bfcffc0ace20db338bced54775b815 (diff)
downloadpoky-7576bd99825a105f1bdc3efc22ed1d0e007f57cc.tar.gz
valgrind: backport enabling for glibc 2.20
Now that we're running glibc 2.20 not 2.19, backport the configure.ac fixes from upstream. (From OE-Core rev: 3a98dd15f19034a1837210f764310c195f9906e1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch23
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch30
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.9.0.bb2
3 files changed, 31 insertions, 24 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch b/meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch
deleted file mode 100644
index 7714b997fe..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Add support for compiling with glibc 2.19
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: valgrind-3.9.0/configure.ac
7===================================================================
8--- valgrind-3.9.0.orig/configure.ac 2014-02-12 09:03:07.879873700 -0800
9+++ valgrind-3.9.0/configure.ac 2014-02-12 09:07:35.099871774 -0800
10@@ -918,6 +918,13 @@
11 DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
12 DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
13 ;;
14+ 2.19)
15+ AC_MSG_RESULT(2.19 family)
16+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
17+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
18+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
19+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
20+ ;;
21 darwin)
22 AC_MSG_RESULT(Darwin)
23 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch b/meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch
new file mode 100644
index 0000000000..fab4044d17
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch
@@ -0,0 +1,30 @@
1Backport of glibc 2.19 and 2.20 support.
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/configure.ac b/configure.ac
7index 229ab98..1c18108 100644
8--- a/configure.ac
9+++ b/configure.ac
10@@ -918,6 +918,20 @@ case "${GLIBC_VERSION}" in
11 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
12 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
13 ;;
14+ 2.19)
15+ AC_MSG_RESULT(2.19 family)
16+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
17+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
18+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
19+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
20+ ;;
21+ 2.20)
22+ AC_MSG_RESULT(2.20 family)
23+ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x])
24+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
25+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
26+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
27+ ;;
28 darwin)
29 AC_MSG_RESULT(Darwin)
30 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 3e8c4ce3d1..c415e773a8 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
15 file://fixed-perl-path.patch \ 15 file://fixed-perl-path.patch \
16 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ 16 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
17 file://sepbuildfix.patch \ 17 file://sepbuildfix.patch \
18 file://glibc-2.19.patch \ 18 file://glibc-2.20.patch \
19 file://force-nostabs.patch \ 19 file://force-nostabs.patch \
20 file://remove-arm-variant-specific.patch \ 20 file://remove-arm-variant-specific.patch \
21 file://remove-ppc-tests-failing-build.patch \ 21 file://remove-ppc-tests-failing-build.patch \