summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-01-09 09:50:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:15 +0000
commitabc9273fd52bec9414b20add26b3bb23e1f48b37 (patch)
tree5f569844d625852b068c842eb0a6d8d3e9bcf3ae
parentbdb52d2e56f48cbbf8c13151f221fbdffe4246ca (diff)
downloadpoky-abc9273fd52bec9414b20add26b3bb23e1f48b37.tar.gz
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>
-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.bb4
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 @@
1Add case for glibc 2.16 and correct error message to denote support until 2.16 1Add case for glibc 2.16 and correct error message to denote support until 2.16
2 2
3Signed-off-by: Khem Raj <raj.khem@gmail.com> 3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
4 5
5Upstream-Status: Pending 6Upstream-Status: Pending
6Index: valgrind-3.7.0/configure.in 7Index: valgrind-3.7.0/configure.in
7=================================================================== 8===================================================================
8--- valgrind-3.7.0.orig/configure.in 2012-07-04 12:57:10.557192441 -0700 9--- valgrind-3.7.0.orig/configure.in
9+++ valgrind-3.7.0/configure.in 2012-07-04 12:57:58.785194776 -0700 10+++ valgrind-3.7.0/configure.in
10@@ -788,6 +788,13 @@ 11@@ -788,6 +788,20 @@ case "${GLIBC_VERSION}" in
11 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 12 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
12 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 13 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
13 ;; 14 ;;
@@ -18,15 +19,22 @@ Index: valgrind-3.7.0/configure.in
18+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 19+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
19+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 20+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
20+ ;; 21+ ;;
22+ 2.17)
23+ AC_MSG_RESULT(2.17 family)
24+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
25+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
26+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
27+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
28+ ;;
21 darwin) 29 darwin)
22 AC_MSG_RESULT(Darwin) 30 AC_MSG_RESULT(Darwin)
23 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) 31 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
24@@ -801,7 +808,7 @@ 32@@ -801,7 +815,7 @@ case "${GLIBC_VERSION}" in
25 33
26 *) 34 *)
27 AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) 35 AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
28- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) 36- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
29+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) 37+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
30 AC_MSG_ERROR([or Darwin libc]) 38 AC_MSG_ERROR([or Darwin libc])
31 ;; 39 ;;
32 esac 40 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 \
9 9
10X11DEPENDS = "virtual/libx11" 10X11DEPENDS = "virtual/libx11"
11DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 11DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
12PR = "r7" 12PR = "r8"
13 13
14SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 14SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
15 file://fix_issue_caused_by_ccache.patch \ 15 file://fix_issue_caused_by_ccache.patch \
@@ -18,7 +18,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
18 file://fix_for_automake_1.11.2.patch \ 18 file://fix_for_automake_1.11.2.patch \
19 file://configure-fix.patch \ 19 file://configure-fix.patch \
20 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ 20 file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
21 file://configure-with-glibc-2.16.patch \ 21 file://configure-with-newer-glibc.patch \
22 " 22 "
23 23
24SRC_URI_append_powerpc = " file://valgrind-3.7.0-fix-error-of-reading-debug-info.patch" 24SRC_URI_append_powerpc = " file://valgrind-3.7.0-fix-error-of-reading-debug-info.patch"