diff options
| author | nibbles 2bits | 2012-03-15 17:31:06 -0700 |
|---|---|---|
| committer | Jack Nagel | 2012-03-16 22:17:45 -0500 |
| commit | 687caec08e7d10cbf4e09ab3eb9b3b8101c01de2 (patch) | |
| tree | ff8beb72b9f87f863ad269edb6681cf0380a5f5f /Library/Formula | |
| parent | 04243da19831a9852293f23de21914fe7e44e970 (diff) | |
| download | homebrew-687caec08e7d10cbf4e09ab3eb9b3b8101c01de2.tar.bz2 | |
mkvalidator: fix compile error with XCode-4.3
Mkvalidator suffers the same problems as mkclean, a hardcoded
path to /Developer and a version-min=10.6. This removes a broken
inreplace, adds a patch to not force an SDK path on 64bit systems
nor a minimum version. Unreported, but identical to mkclean that
was reported. Fixes compile errors on Lion.
Closes #10971.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/mkvalidator.rb | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/Library/Formula/mkvalidator.rb b/Library/Formula/mkvalidator.rb index 8f888b973..2dc1de14f 100644 --- a/Library/Formula/mkvalidator.rb +++ b/Library/Formula/mkvalidator.rb @@ -5,17 +5,32 @@ class Mkvalidator < Formula homepage 'http://www.matroska.org/downloads/mkvalidator.html' sha1 '4dada51d23255dffb4176450b410d6326a72d845' + def patches + # see https://sourceforge.net/tracker/?group_id=68739&atid=522230 + DATA if MacOS.prefer_64_bit? + end + def install ENV.j1 # Otherwise there are races - - # For 64-bit kernels, just use the Snow Leopard SDK. - inreplace "corec/tools/coremake/gcc_osx_x64.build" do |s| - s.gsub! /10\.4u?/, "10.6" - end - system "./configure" system "make -C mkvalidator" bindir = `corec/tools/coremake/system_output.sh`.chomp bin.install "release/#{bindir}/mkvalidator" end end + +__END__ +--- a/corec/tools/coremake/gcc_osx_x64.build 2011-09-25 08:01:47.000000000 -0700 ++++ b/corec/tools/coremake/gcc_osx_x64.build 2012-03-15 17:17:44.000000000 -0700 +@@ -4,9 +4,9 @@ + + PLATFORMLIB = osx_x86 + SVNDIR = osx_x86 +-SDK = /Developer/SDKs/MacOSX10.6.sdk + +-CCFLAGS=%(CCFLAGS) -arch x86_64 -mdynamic-no-pic -mmacosx-version-min=10.6 ++ ++CCFLAGS=%(CCFLAGS) -arch x86_64 -mdynamic-no-pic + ASMFLAGS = -f macho64 -D_MACHO + + #include "gcc_osx.inc" |