valgrind: upgrade for eglibc 2.12

the current version only works with libc upto 2.10
hence upgraded to support eglibc 2.12

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

4 files changed, 37 insertions, 20 deletions

diff --git a/meta/packages/valgrind/valgrind/configurefix.patch b/meta/packages/valgrind/valgrind/configurefix.patch
deleted file mode 100644
index f2e1442980..0000000000
--- a/meta/packages/valgrind/valgrind/configurefix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: valgrind-3.5.0/configure.in
-===================================================================
---- valgrind-3.5.0.orig/configure.in    2009-09-03 23:38:46.000000000 +0100
-+++ valgrind-3.5.0/configure.in 2009-09-03 23:39:03.000000000 +0100
-@@ -1472,10 +1472,8 @@
- #----------------------------------------------------------------------------
- # Check for /proc filesystem
- #----------------------------------------------------------------------------
--AC_CHECK_FILES(/proc/self/fd /proc/self/exe /proc/self/maps, 
--    [ AC_DEFINE([HAVE_PROC], 1, [can use /proc filesystem]) ], 
--    [])
- 
-+AC_DEFINE([HAVE_PROC], 1, [can use /proc filesystem])
- 
- #----------------------------------------------------------------------------
- # Checks for C header files.
diff --git a/meta/packages/valgrind/valgrind/fix_issue_caused_by_ccache.patch b/meta/packages/valgrind/valgrind/fix_issue_caused_by_ccache.patch
new file mode 100644
index 0000000000..a5c273c45b
--- /dev/null
+++ b/meta/packages/valgrind/valgrind/fix_issue_caused_by_ccache.patch
@@ -0,0 +1,30 @@
+The script does not expect use of ccache, hence fix it to recognise it.
+
+2010/08/17
+Nitin A Kamble <nitin.a.kamble@intel.com>
+
+Index: valgrind-3.5.0/coregrind/link_tool_exe_linux.in
+===================================================================
+--- valgrind-3.5.0.orig/coregrind/link_tool_exe_linux.in
++++ valgrind-3.5.0/coregrind/link_tool_exe_linux.in
+@@ -62,6 +62,11 @@ die "Bogus alt-load address"
+ 
+ # The cc invokation to do the final link
+ my $cc = $ARGV[1];
++my $next = 2;
++if ("$cc" eq "ccache") {
++    $cc = "$cc $ARGV[2]";
++    $next = 3;
++}
+ 
+ # and the 'restargs' are argv[2 ..]
+ 
+@@ -71,7 +76,7 @@ my $cc = $ARGV[1];
+ my $cmd="$cc -static -Wl,-Ttext=$ala";
+ 
+ # Add the rest of the parameters
+-foreach my $n (2 .. $#ARGV) {
++foreach my $n ($next .. $#ARGV) {
+    $cmd = "$cmd $ARGV[$n]";
+ }
+ 
diff --git a/meta/packages/valgrind/valgrind/valgrind_3.5.0-svn_r11264.patch.bz2 b/meta/packages/valgrind/valgrind/valgrind_3.5.0-svn_r11264.patch.bz2
new file mode 100644
index 0000000000..66b3698f25
--- /dev/null
+++ b/meta/packages/valgrind/valgrind/valgrind_3.5.0-svn_r11264.patch.bz2
diff --git a/meta/packages/valgrind/valgrind_3.5.0.bb b/meta/packages/valgrind/valgrind_3.5.0.bb
index c4210263ab..d8accb3c83 100644
--- a/meta/packages/valgrind/valgrind_3.5.0.bb
+++ b/meta/packages/valgrind/valgrind_3.5.0.bb
@@ -3,19 +3,22 @@ HOMEPAGE = "http://valgrind.org/"
 BUGTRACKER = "http://valgrind.org/support/bug_reports.html"
 LICENSE = "GPLv2+ & BSD & FDLv1.2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
-                    file://include/pub_tool_basics.h;beginline=1;endline=29;md5=db4e6fac5f1db2d462f2100c9874297b \
-                    file://include/valgrind.h;beginline=1;endline=56;md5=432729351dcaf9c2f772316c0ea47343 \
+                    file://include/pub_tool_basics.h;beginline=1;endline=29;md5=b4765f122b7672cdf9b2e8fd75a33172 \
+                    file://include/valgrind.h;beginline=1;endline=56;md5=13a71cedba99112334d8596162aec37e \
                     file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
 DEPENDS = "virtual/libx11"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
-           file://configurefix.patch"
+           file://valgrind_3.5.0-svn_r11264.patch.bz2 \
+           file://fix_issue_caused_by_ccache.patch " 
 
 COMPATIBLE_HOST = 'i.86.*-linux'
 
 inherit autotools
 
 EXTRA_OECONF = "--enable-tls"
+EXTRA_OEMAKE = "-w"
+PARALLEL_MAKE = ""
 
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug/*"