diff options
| author | Mike McQuaid | 2012-08-22 13:34:26 -0700 |
|---|---|---|
| committer | Mike McQuaid | 2012-08-22 13:34:26 -0700 |
| commit | 1f8af42feef19bdb2aa7f508c8486eea32a75993 (patch) | |
| tree | a431bcfe727adb16afb1bdb8157708650aaa428b | |
| parent | 97d1dc4f2b6a9a070f90c8f0f7c0ed0a3c5529fd (diff) | |
| download | brew-1f8af42feef19bdb2aa7f508c8486eea32a75993.tar.bz2 | |
Don't use XQuartz for e.g. :libpng on 10.8.
XQuartz isn't added to the default library paths so if something is
linked against a Homebrew libpng then it doesn't work against the
XQuartz libpng. The CLT provides X11 on Lion so don't request users
install XQuartz if it isn't needed on Mountain Lion.
Fixes Homebrew/homebrew#14325.
| -rw-r--r-- | Library/Homebrew/dependencies.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb index c35bce9fd..a8ff1a8ad 100644 --- a/Library/Homebrew/dependencies.rb +++ b/Library/Homebrew/dependencies.rb @@ -63,8 +63,8 @@ private # Xcode no longer provides autotools or some other build tools Dependency.new(spec.to_s) unless MacOS::Xcode.provides_autotools? when :libpng, :freetype, :pixman, :fontconfig, :cairo - if MacOS.version >= :lion - MacOS::XQuartz.installed? ? X11Dependency.new(tag) : Dependency.new(spec.to_s) + if MacOS.version >= :mountain_lion + Dependency.new(spec.to_s) else X11Dependency.new(tag) end |