3 files changed, 20 insertions, 23 deletions

diff --git a/meta/packages/valgrind/files/makefile_fix.patch b/meta/packages/valgrind/files/makefile_fix.patch
deleted file mode 100644
index 1a7bb4895a..0000000000
--- a/meta/packages/valgrind/files/makefile_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- VEX/Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: valgrind-3.2.1/VEX/Makefile
-===================================================================
---- valgrind-3.2.1.orig/VEX/Makefile    2006-08-28 14:39:42.000000000 +0100
-+++ valgrind-3.2.1/VEX/Makefile 2006-11-29 13:52:36.000000000 +0000
-@@ -64,10 +64,10 @@ PUB_INCLUDES = -Ipub
- PRIV_INCLUDES = -Ipriv
- 
- 
--ifndef $(CC)
-+ifndef CC
-    CC = gcc 
- endif 
--ifndef $(AR)
-+ifndef AR
-    AR = ar 
- endif
- 
diff --git a/meta/packages/valgrind/valgrind/configurefix.patch b/meta/packages/valgrind/valgrind/configurefix.patch
new file mode 100644
index 0000000000..f2e1442980
--- /dev/null
+++ b/meta/packages/valgrind/valgrind/configurefix.patch
@@ -0,0 +1,16 @@
+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_3.3.0.bb b/meta/packages/valgrind/valgrind_3.5.0.bb
index fc4b084c86..fece8ea0e8 100644
--- a/meta/packages/valgrind/valgrind_3.3.0.bb
+++ b/meta/packages/valgrind/valgrind_3.5.0.bb
@@ -2,15 +2,16 @@ DESCRIPTION = "Valgrind memory debugger"
 DEPENDS = "virtual/libx11"
 HOMEPAGE = "http://www.valgrind.org/"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 "
+SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
+           file://configurefix.patch;patch=1 "
 
 S = "${WORKDIR}/valgrind-${PV}"
 
 COMPATIBLE_HOST = 'i.86.*-linux'
 
-inherit autotools
+inherit autotools_stage
 
 EXTRA_OECONF = "--enable-tls"