Skip to content
This repository has been archived by the owner on Jan 16, 2025. It is now read-only.

wxmac: disable monolithic build; erlang: build with wx support #26982

Merged
merged 2 commits into from
Mar 1, 2014
Merged

wxmac: disable monolithic build; erlang: build with wx support #26982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72bbddf
wxmac: disable monolithic build
adamv Feb 25, 2014
f95e5bc
erlang: build with wx support by default
adamv Feb 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Library/Formula/erlang.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class Erlang < Formula
depends_on :libtool
depends_on 'unixodbc' if MacOS.version >= :mavericks
depends_on 'fop' => :optional # enables building PDF docs
depends_on 'wxmac' => :recommended

fails_with :llvm

Expand Down Expand Up @@ -65,6 +66,8 @@ def install
--enable-smp-support
]

args << "--enable-wx" if build.with? 'wxmac'

if MacOS.version >= :snow_leopard and MacOS::CLT.installed?
args << "--with-dynamic-trace=dtrace"
end
Expand Down Expand Up @@ -110,6 +113,7 @@ def caveats; <<-EOS.undent
end
end
end

__END__
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index 83f7a47..fd711fe 100644
Expand Down
11 changes: 6 additions & 5 deletions Library/Formula/wxmac.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -58,8 +57,9 @@ def install_wx_python

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the first two lines were supposed to be separate thoughts.

# and fail on newer OSes
# https://trac.macports.org/browser/trunk/dports/graphics/wxWidgets30/Portfile#L80
ENV.universal_binary
args = [
Expand Down Expand Up @@ -91,9 +91,10 @@ def install
"--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"
Expand Down