From 358ff1ea2f94e56018cd7b90f9b73365fdc35c36 Mon Sep 17 00:00:00 2001 From: Rui Pereira Date: Sun, 9 Oct 2011 18:45:11 +0200 Subject: Valgrind: HEAD installs now work on Lion Closes #8040. Signed-off-by: Charlie Sharpsteen --- Library/Formula/valgrind.rb | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'Library') diff --git a/Library/Formula/valgrind.rb b/Library/Formula/valgrind.rb index 34c377e2e..f2b22043a 100644 --- a/Library/Formula/valgrind.rb +++ b/Library/Formula/valgrind.rb @@ -14,37 +14,26 @@ class Valgrind < Formula skip_clean 'lib' def patches - patch_hash = {} # Xcode 4 fix from upstream r11686 # https://bugs.kde.org/show_bug.cgi?id=267997 - patch_hash[:po] = DATA if MacOS.xcode_version >= "4.0" and not ARGV.build_head? - - # Enable compilation to occur on Lion---Valgrind may be unstable. Upstream - # issue tracking official suport: - # https://bugs.kde.org/show_bug.cgi?id=275168 - patch_hash[:p1] = 'https://raw.github.com/gist/1234173' if MacOS.lion? and ARGV.force? - end + DATA + end if MacOS.xcode_version >= "4.0" and not ARGV.build_head? def install - if MacOS.lion? and not ARGV.force? + if MacOS.lion? and not ARGV.build_head? onoe <<-EOS.undent - Valgrind is currently unsupported on Lion. Using `brew install --force valgrind` - will patch the configure script such that a compilation will be attempted. The - results may be unstable and we take no responsibility for them. - - For now, all issues concerning Lion support should be forwarded to the Valgrind - bugtracker: - https://bugs.kde.org/show_bug.cgi?id=275168 + The current stable version of Valgrind (3.6.1) does not work on Lion. + You may try `brew install valgrind --HEAD` to install an unstable + version that has some Lion support. EOS exit 1 end - # Remove when Xcode 4 fix is removed - system "autoreconf -ivf" if MacOS.xcode_version >= "4.0" and not ARGV.build_head? - args = ["--prefix=#{prefix}", "--mandir=#{man}"] args << "--enable-only64bit" << "--build=amd64-darwin" if MacOS.prefer_64_bit? + # Remove the `xcode_version` piece after the next update. + system "./autogen.sh" if MacOS.xcode_version >= "4.0" or ARGV.build_head? system "./configure", *args system "make install" end -- cgit v1.2.3