diff options
| author | nibbles 2bits | 2012-03-15 17:04:47 -0700 |
|---|---|---|
| committer | Jack Nagel | 2012-03-16 22:17:46 -0500 |
| commit | 480281cbc56d4ce356d8cdd6edf8af4922ea2627 (patch) | |
| tree | 20caad39354ff1e463a488101207463a788157b7 | |
| parent | 687caec08e7d10cbf4e09ab3eb9b3b8101c01de2 (diff) | |
| download | homebrew-480281cbc56d4ce356d8cdd6edf8af4922ea2627.tar.bz2 | |
mkclean: fix compile with XCode-4.3
Fixes compiler error with mkclean-0.8.6 and XCode-4.3+ due to a
hardcoded /Developer and macosx-version-min. Those are set to the
optimal value by default.
- inreplace was failing due to unnoticed fix upstream.
- remove inreplace
- patch if MacOS.prefer_64_bit, don't set SDK path or min version.
Reported upstream, noted in formula.
https://sourceforge.net/tracker/?func=detail&aid=3505611&group_id=68739&atid=522228
Closes #10970.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/mkclean.rb | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/Library/Formula/mkclean.rb b/Library/Formula/mkclean.rb index d7b70477c..cb0b99584 100644 --- a/Library/Formula/mkclean.rb +++ b/Library/Formula/mkclean.rb @@ -5,17 +5,33 @@ class Mkclean < Formula homepage 'http://www.matroska.org/downloads/mkclean.html' sha1 'dd59c50178c5d1b11190e466c0562ac3cd64cd71' - 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 + def patches + # Fixes compile error with with XCode-4.3+, a hardcoded /Developer. Reported as: + # https://sourceforge.net/tracker/?func=detail&aid=3505611&group_id=68739&atid=522228 + DATA if MacOS.prefer_64_bit? + end + def install + ENV.deparallelize # Otherwise there are races system "./configure" system "make -C mkclean" bindir = `corec/tools/coremake/system_output.sh`.chomp bin.install Dir["release/#{bindir}/mk*"] end end + +__END__ +--- a/corec/tools/coremake/gcc_osx_x64.build 2011-09-25 02:25:46.000000000 -0700 ++++ b/corec/tools/coremake/gcc_osx_x64.build 2012-03-15 16:27:46.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" |