diff options
| author | Jack Nagel | 2014-05-28 09:20:44 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-28 09:23:36 -0500 |
| commit | c90247aa44272b60df247c6c83512e2a6bd23395 (patch) | |
| tree | e9dac8834d62a0b9c103f2d44f11cc1d37304671 | |
| parent | 2c61e3c02acfc09ee01ac3affc0374bebd83ead3 (diff) | |
| download | brew-c90247aa44272b60df247c6c83512e2a6bd23395.tar.bz2 | |
Place X11 ahead of OpenGL when X11 is active
Fixes Homebrew/homebrew#29651.
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index c68e6eb86..e1288f5cb 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -167,8 +167,8 @@ module Superenv paths << "#{HOMEBREW_PREFIX}/include" paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.include? "libxml2" paths << "#{effective_sysroot}/usr/include/apache2" if MacOS::Xcode.without_clt? - paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11? + paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" paths.to_path_s end @@ -179,8 +179,8 @@ module Superenv def determine_library_paths paths = keg_only_deps.map { |dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/lib" } paths << "#{HOMEBREW_PREFIX}/lib" - paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" paths << MacOS::X11.lib.to_s if x11? + paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" paths.to_path_s end @@ -194,15 +194,15 @@ module Superenv paths = [] paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.include? "libxml2" paths << "#{effective_sysroot}/usr/include/apache2" if MacOS::Xcode.without_clt? - paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11? + paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" paths.to_path_s end def determine_cmake_library_path paths = [] - paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" paths << MacOS::X11.lib.to_s if x11? + paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" paths.to_path_s end |