diff options
| author | Ross Burton <ross.burton@intel.com> | 2014-09-09 23:29:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-10 11:30:39 +0100 |
| commit | 3a98dd15f19034a1837210f764310c195f9906e1 (patch) | |
| tree | 113cb4ca955c4fbf464b50aeb8d09325a717bf74 /meta | |
| parent | 23efb1755c3074e17c547f9b9fd13564cc6d8566 (diff) | |
| download | openembedded-core-3a98dd15f19034a1837210f764310c195f9906e1.tar.gz openembedded-core-3a98dd15f19034a1837210f764310c195f9906e1.tar.bz2 openembedded-core-3a98dd15f19034a1837210f764310c195f9906e1.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/glibc-2.19.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/glibc-2.20.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.9.0.bb | 2 |
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 @@ -Add support for compiling with glibc 2.19 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: valgrind-3.9.0/configure.ac -=================================================================== ---- valgrind-3.9.0.orig/configure.ac 2014-02-12 09:03:07.879873700 -0800 -+++ valgrind-3.9.0/configure.ac 2014-02-12 09:07:35.099871774 -0800 -@@ -918,6 +918,13 @@ - DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.19) -+ AC_MSG_RESULT(2.19 family) -+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.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/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 @@ +Backport of glibc 2.19 and 2.20 support. + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +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 + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.19) ++ AC_MSG_RESULT(2.19 family) ++ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.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}" ++ ;; ++ 2.20) ++ AC_MSG_RESULT(2.20 family) ++ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.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.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 \ file://fixed-perl-path.patch \ file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ file://sepbuildfix.patch \ - file://glibc-2.19.patch \ + file://glibc-2.20.patch \ file://force-nostabs.patch \ file://remove-arm-variant-specific.patch \ file://remove-ppc-tests-failing-build.patch \ |