valgrind: apply 10.9 patch and cleanup.

Fixes #26061.

1 files changed, 9 insertions, 7 deletions

diff --git a/Library/Formula/valgrind.rb b/Library/Formula/valgrind.rb
index f60e12fbc..8ea724c67 100644
--- a/Library/Formula/valgrind.rb
+++ b/Library/Formula/valgrind.rb
@@ -4,10 +4,9 @@ class Valgrind < Formula
   homepage 'http://www.valgrind.org/'
   url 'http://valgrind.org/downloads/valgrind-3.9.0.tar.bz2'
   sha1 '9415e28933de9d6687f993c4bb797e6bd49583f1'
+  head 'svn://svn.valgrind.org/valgrind/trunk'
 
-  head do
-    url 'svn://svn.valgrind.org/valgrind/trunk'
-
+  if build.head? || MacOS.version == :mavericks
     depends_on :autoconf
     depends_on :automake
     depends_on :libtool
@@ -24,10 +23,13 @@ class Valgrind < Formula
     #    add missing CFLAGS. See: https://bugs.kde.org/show_bug.cgi?id=295084
     # 2: Fix for 10.7.4 w/XCode-4.5, duplicate symbols. Reported upstream in
     #    https://bugs.kde.org/show_bug.cgi?id=307415
+    # 3: Fix for 10.9 Mavericks. From upstream bug:
+    #    https://bugs.kde.org/show_bug.cgi?id=326724#c12
     p = []
     p << 'https://gist.github.com/raw/3784836/f046191e72445a2fc8491cb6aeeabe84517687d9/patch1.diff' unless MacOS::CLT.installed?
     p << 'https://gist.github.com/raw/3784930/dc8473c0ac5274f6b7d2eb23ce53d16bd0e2993a/patch2.diff' if MacOS.version == :lion
-    return p
+    p << 'https://gist.github.com/mckelvin/8514475/raw/1939e5dfeb1dfc2974582f0dbbf5e3aaeb46d17a/valgrind-3.9.0-marericks.patch' if MacOS.version == :mavericks
+    p
   end
 
   def install
@@ -41,10 +43,10 @@ class Valgrind < Formula
       args << "--enable-only32bit"
     end
 
-    system "./autogen.sh" if build.head?
+    system "./autogen.sh" if build.head? || MacOS.version == :mavericks
     system "./configure", *args
-    system 'make'
-    system "make install"
+    system "make"
+    system "make", "install"
   end
 
   def test