Skip to content

Commit

Permalink
wine: always use Homebrew freetype
Browse files Browse the repository at this point in the history
  • Loading branch information
jacknagel committed Mar 12, 2014
1 parent 9e1bbbb commit ffcc04f
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions Library/Formula/wine.rb
Expand Up @@ -40,7 +40,7 @@ class Wine < Formula
# Wine will build both the Mac and the X11 driver by default, and you can switch
# between them. But if you really want to build without X11, you can.
depends_on :x11 => :recommended
depends_on 'freetype' if build.without? 'x11'
depends_on 'freetype'
depends_on 'jpeg'
depends_on 'libgphoto2'
depends_on 'little-cms2'
Expand Down Expand Up @@ -118,12 +118,6 @@ def install
ENV.libxml2
ENV.append "LDFLAGS", "-lxslt"

# 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.
# We cannot use FREETYPE_LIBS because it is inserted after LDFLAGS and thus cannot
# take precedence over the homebrew freetype.
ENV.prepend "LDFLAGS", "-L#{MacOS::X11.lib}" if build.with? 'x11'

args = ["--prefix=#{prefix}"]
args << "--disable-win16" if MacOS.version <= :leopard or ENV.compiler == :clang

Expand Down

0 comments on commit ffcc04f

Please sign in to comment.