diff options
-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.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 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 @@ | |||
1 | Backport of glibc 2.19 and 2.20 support. | 1 | Backport of glibc 2.19 and 2.20 and 2.21 support. |
2 | 2 | ||
3 | Upstream-Status: Backport | 3 | Upstream-Status: Backport |
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
@@ -7,7 +7,7 @@ diff --git a/configure.ac b/configure.ac | |||
7 | index 229ab98..1c18108 100644 | 7 | index 229ab98..1c18108 100644 |
8 | --- a/configure.ac | 8 | --- a/configure.ac |
9 | +++ b/configure.ac | 9 | +++ b/configure.ac |
10 | @@ -918,6 +918,20 @@ case "${GLIBC_VERSION}" in | 10 | @@ -918,6 +918,27 @@ case "${GLIBC_VERSION}" in |
11 | DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | 11 | DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
12 | DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | 12 | DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
13 | ;; | 13 | ;; |
@@ -25,6 +25,13 @@ index 229ab98..1c18108 100644 | |||
25 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.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}" | 26 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
27 | + ;; | 27 | + ;; |
28 | + 2.21) | ||
29 | + AC_MSG_RESULT(2.21 family) | ||
30 | + AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x]) | ||
31 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
32 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
33 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
34 | + ;; | ||
28 | darwin) | 35 | darwin) |
29 | AC_MSG_RESULT(Darwin) | 36 | AC_MSG_RESULT(Darwin) |
30 | AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) | 37 | 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 \ | |||
16 | file://fixed-perl-path.patch \ | 16 | file://fixed-perl-path.patch \ |
17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ | 17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ |
18 | file://sepbuildfix.patch \ | 18 | file://sepbuildfix.patch \ |
19 | file://glibc-2.20.patch \ | 19 | file://glibc.patch \ |
20 | file://force-nostabs.patch \ | 20 | file://force-nostabs.patch \ |
21 | file://remove-arm-variant-specific.patch \ | 21 | file://remove-arm-variant-specific.patch \ |
22 | file://remove-ppc-tests-failing-build.patch \ | 22 | file://remove-ppc-tests-failing-build.patch \ |