valgrind: update configure for eglibc 2.17

(From OE-Core rev: bd42666f1bfd0e23a57709b84577018da0a704ff)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2013-01-09 09:50:23 -08:00 committed by Richard Purdie
parent bdb52d2e56
commit abc9273fd5
2 changed files with 15 additions and 7 deletions

View File

@ -1,13 +1,14 @@
Add case for glibc 2.16 and correct error message to denote support until 2.16 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: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Upstream-Status: Pending Upstream-Status: Pending
Index: valgrind-3.7.0/configure.in 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.orig/configure.in
+++ valgrind-3.7.0/configure.in 2012-07-04 12:57:58.785194776 -0700 +++ valgrind-3.7.0/configure.in
@@ -788,6 +788,13 @@ @@ -788,6 +788,20 @@ case "${GLIBC_VERSION}" in
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;; ;;
@ -17,16 +18,23 @@ Index: valgrind-3.7.0/configure.in
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.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) darwin)
AC_MSG_RESULT(Darwin) AC_MSG_RESULT(Darwin)
AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using 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_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.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]) AC_MSG_ERROR([or Darwin libc])
;; ;;
esac esac

View File

@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
X11DEPENDS = "virtual/libx11" X11DEPENDS = "virtual/libx11"
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
PR = "r7" PR = "r8"
SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
file://fix_issue_caused_by_ccache.patch \ 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://fix_for_automake_1.11.2.patch \
file://configure-fix.patch \ file://configure-fix.patch \
file://Added-support-for-PPC-instructions-mfatbu-mfatbl.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" SRC_URI_append_powerpc = " file://valgrind-3.7.0-fix-error-of-reading-debug-info.patch"