Tested with both eglibc 2.16 and 2.17 Signed-off-by: Saul Wold <[email protected]> --- ...ibc-2.16.patch => configure-with-newer-glibc.patch} | 18 +++++++++++++----- meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 4 ++-- 2 files changed, 15 insertions(+), 7 deletions(-) rename meta/recipes-devtools/valgrind/valgrind-3.7.0/{configure-with-glibc-2.16.patch => configure-with-newer-glibc.patch} (62%)
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 similarity index 62% rename from meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-glibc-2.16.patch rename to meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-with-newer-glibc.patch index c622637..b369de8 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 <[email protected]> +Signed-off-by: Saul Wold <[email protected]> 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 3def11d..0bf6ef4 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" -- 1.8.0.2 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
