diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-01-09 09:50:23 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-01-09 16:40:38 -0800 |
| commit | bd42666f1bfd0e23a57709b84577018da0a704ff (patch) | |
| tree | 11adf4e0bc2ed60a3a2ea250db1ef704a7af9ccb /meta | |
| parent | 2e6c202c000cfd0edbc024468c9f6c4b8b7eb816 (diff) | |
| download | openembedded-core-bd42666f1bfd0e23a57709b84577018da0a704ff.tar.gz openembedded-core-bd42666f1bfd0e23a57709b84577018da0a704ff.tar.bz2 openembedded-core-bd42666f1bfd0e23a57709b84577018da0a704ff.zip | |
valgrind: update configure for eglibc 2.17
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-newer-glibc.patch (renamed from meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-glibc-2.16.patch) | 18 | ||||
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-glibc-2.16.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-newer-glibc.patch index c622637d2d..b369de8901 100644 --- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-glibc-2.16.patch +++ b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-newer-glibc.patch @@ -1,13 +1,14 @@ Add case for glibc 2.16 and correct error message to denote support until 2.16 Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Saul Wold <sgw@linux.intel.com> Upstream-Status: Pending Index: valgrind-3.7.0/configure.in =================================================================== ---- valgrind-3.7.0.orig/configure.in 2012-07-04 12:57:10.557192441 -0700 -+++ valgrind-3.7.0/configure.in 2012-07-04 12:57:58.785194776 -0700 -@@ -788,6 +788,13 @@ +--- valgrind-3.7.0.orig/configure.in ++++ valgrind-3.7.0/configure.in +@@ -788,6 +788,20 @@ case "${GLIBC_VERSION}" in DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; @@ -18,15 +19,22 @@ Index: valgrind-3.7.0/configure.in + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.17) ++ AC_MSG_RESULT(2.17 family) ++ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="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]) -@@ -801,7 +808,7 @@ +@@ -801,7 +815,7 @@ case "${GLIBC_VERSION}" in *) AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17]) AC_MSG_ERROR([or Darwin libc]) ;; esac diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb index 3def11dd39..0bf6ef446d 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \ X11DEPENDS = "virtual/libx11" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" -PR = "r7" +PR = "r8" SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://fix_issue_caused_by_ccache.patch \ @@ -18,7 +18,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://fix_for_automake_1.11.2.patch \ file://configure-fix.patch \ file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ - file://configure-with-glibc-2.16.patch \ + file://configure-with-newer-glibc.patch \ " SRC_URI_append_powerpc = " file://valgrind-3.7.0-fix-error-of-reading-debug-info.patch" |