summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-16 15:12:54 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:58:40 +0000
commit7edf3dc05955042349ed71d329b6a2477963cb3f (patch)
treefc8dc0f4be0d82a8f05a84628d64de526bf589c5 /meta
parent93d70e4b863b17688c855c032c628bc34d7b6dd0 (diff)
downloadpoky-7edf3dc05955042349ed71d329b6a2477963cb3f.tar.gz
valgrind: Update for eglibc 2.15
(From OE-Core rev: 8953e4a93ce6ad0257a094fdc6f3cd88ac5e89b9) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch25
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.7.0.bb2
2 files changed, 22 insertions, 5 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
index a3fce84c20..1f4bd7ef40 100644
--- a/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
+++ b/meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch
@@ -1,13 +1,16 @@
1To recognize gcc version from poky in configure.in 1To recognize gcc version from poky in configure.in
2Added GLIBC 2.15 stanza to supported GLIBCs
2 3
3Upstream-Status: Inappropriate [configuration] 4Upstream-Status: Inappropriate [configuration]
4 5
5Signed-off-by: Shane Wang <shane.wang@intel.com> 6Signed-off-by: Shane Wang <shane.wang@intel.com>
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
6 8
7diff -r 91a8df96084a configure.in 9Index: valgrind-3.7.0/configure.in
8--- a/configure.in Fri Dec 23 20:57:01 2011 +0800 10===================================================================
9+++ b/configure.in Fri Dec 23 20:59:21 2011 +0800 11--- valgrind-3.7.0.orig/configure.in
10@@ -104,11 +104,13 @@ 12+++ valgrind-3.7.0/configure.in
13@@ -104,11 +104,13 @@ AC_MSG_CHECKING([for a supported version
11 # 14 #
12 # i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) 15 # i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
13 # i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00) 16 # i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
@@ -21,3 +24,17 @@ diff -r 91a8df96084a configure.in
21 | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`] 24 | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
22 25
23 is_clang="notclang" 26 is_clang="notclang"
27@@ -779,6 +781,13 @@ case "${GLIBC_VERSION}" in
28 DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
29 DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
30 ;;
31+ 2.15)
32+ AC_MSG_RESULT(2.15 family)
33+ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
34+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
35+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
36+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
37+ ;;
38 darwin)
39 AC_MSG_RESULT(Darwin)
40 AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index 858bf3dda6..9c53262c60 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
7 file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \ 7 file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \
8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" 8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
9DEPENDS = "virtual/libx11" 9DEPENDS = "virtual/libx11"
10PR = "r2" 10PR = "r3"
11 11
12SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 12SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
13 file://fix_issue_caused_by_ccache.patch \ 13 file://fix_issue_caused_by_ccache.patch \