From 72bbddf28786c5a57c97eb430f0b45821daea0c3 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Mon, 24 Feb 2014 20:16:53 -0800 Subject: wxmac: disable monolithic build More software requires non-monolithic builds than the other way around Closes #26624. --- Library/Formula/wxmac.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/wxmac.rb b/Library/Formula/wxmac.rb index a4d677e7d..52819c05b 100644 --- a/Library/Formula/wxmac.rb +++ b/Library/Formula/wxmac.rb @@ -18,7 +18,6 @@ class Wxmac < Formula url 'http://downloads.sourceforge.net/project/wxpython/wxPython/3.0.0.0/wxPython-src-3.0.0.0.tar.bz2' sha1 '48451763275cfe4e5bbec49ccd75bc9652cba719' - option 'disable-monolithic', "Build a non-monolithic library (split into multiple files)" depends_on :python => :recommended depends_on FrameworkPython if build.with? "python" @@ -58,8 +57,9 @@ class Wxmac < Formula def install # need to set with-macosx-version-min to avoid configure defaulting to 10.5 - # need to enable universal binary build in order to build all x86_64 headers - # need to specify x86_64 and i386 or will try to build for ppc arch and fail on newer OSes + # need to enable universal binary build in order to build all x86_64 + # headers need to specify x86_64 and i386 or will try to build for ppc arch + # and fail on newer OSes # https://trac.macports.org/browser/trunk/dports/graphics/wxWidgets30/Portfile#L80 ENV.universal_binary args = [ @@ -91,9 +91,10 @@ class Wxmac < Formula "--with-macosx-version-min=#{MacOS.version}", "--with-macosx-sdk=#{MacOS.sdk_path}", "--enable-universal_binary=#{Hardware::CPU.universal_archs.join(',')}", - "--disable-precomp-headers" + "--disable-precomp-headers", + # This is the default option, but be explicit + "--disable-monolithic" ] - args << "--enable-monolithic" unless build.include? 'disable-monolithic' system "./configure", *args system "make install" -- cgit v1.2.3