diff options
| author | Camillo Lugaresi | 2013-02-05 02:13:11 -0600 |
|---|---|---|
| committer | Adam Vandenberg | 2013-02-05 19:57:21 -0800 |
| commit | be74c06bae85ed904b101bb6490b3a1a48cb705c (patch) | |
| tree | 9e4ee1530a93de3e76e23dd6343ec21a9ea5721e /Library | |
| parent | 706d74d6ac94d715466cfb8dc1708b2387d7abfa (diff) | |
| download | homebrew-be74c06bae85ed904b101bb6490b3a1a48cb705c.tar.bz2 | |
wine: always build dependencies as universal
Closes #17603.
Closes #17616.
Closes #14550.
Closes #15478.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/wine.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb index ac652b0d1..b790639bd 100644 --- a/Library/Formula/wine.rb +++ b/Library/Formula/wine.rb @@ -33,9 +33,12 @@ class Wine < Formula env :std - option :universal + # this tells Homebrew that dependencies must be built universal + def build.universal? ; true; end depends_on :x11 + # note: we get freetype from :x11, but if the freetype formula has been installed + # separately and not built universal, it's going to get picked up and break the build depends_on 'jpeg' depends_on 'libicns' depends_on 'libtiff' @@ -53,7 +56,7 @@ class Wine < Formula end # the following libraries are currently not specified as dependencies, or not built as 32-bit: - # configure: libsane, libv4l, libgphoto2, liblcms, gstreamer-0.10, libcapi20, libgsm, libtiff + # configure: libsane, libv4l, libgphoto2, gstreamer-0.10, libcapi20, libgsm # Wine loads many libraries lazily using dlopen calls, so it needs these paths # to be searched by dyld. @@ -102,15 +105,6 @@ class Wine < Formula --x-lib=#{MacOS::X11.lib}] args << "--disable-win16" if MacOS.version == :leopard or ENV.compiler == :clang - if not build.universal? - opoo <<-EOS.undent - Not building a universal wine, you will only be able to run - applications built for win64! To get support for win32 build with: - brew install wine --universal - - EOS - args << "--enable-win64" - end # 64-bit builds of mpg123 are incompatible with 32-bit builds of Wine args << "--without-mpg123" if Hardware.is_64_bit? |