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 Homebrew/homebrew#10970. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
parent
be22982889
commit
078c2b6264
1 changed files with 23 additions and 7 deletions
|
@ -5,17 +5,33 @@ class Mkclean < Formula
|
|||
homepage 'http://www.matroska.org/downloads/mkclean.html'
|
||||
sha1 'dd59c50178c5d1b11190e466c0562ac3cd64cd71'
|
||||
|
||||
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.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
|
||||
|
||||
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"
|
||||
|
|
Loading…
Reference in a new issue