admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Put X11 last in the libpath and cpath

Browse Source 
It was after HOMEBREW_PREFIX but not after everything else too.
This commit is contained in:
Max Howell 2012-09-03 14:17:40 -04:00
parent fdadd7e9dd
commit 4febf938ae
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/superenv.rb
View File

@ -125,9 +125,8 @@ class << ENV
def determine_cmake_prefix_path def determine_cmake_prefix_path
paths = deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}" } paths = deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}" }
paths << HOMEBREW_PREFIX.to_s # put ourselves ahead of everything else
paths << "#{MacOS.sdk_path}/usr" if MacSystem.xcode43_without_clt? paths << "#{MacOS.sdk_path}/usr" if MacSystem.xcode43_without_clt?
paths << HOMEBREW_PREFIX.to_s # again always put ourselves ahead of X11
paths << MacSystem.x11_prefix if x11?
paths.to_path_s paths.to_path_s
end end
@ -142,13 +141,17 @@ class << ENV
paths << "#{sdk}/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.7" paths << "#{sdk}/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.7"
end end
paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/" paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/"
paths << "#{MacSystem.x11_prefix}/include" if x11?
paths.to_path_s paths.to_path_s
end end
def determine_cmake_library_path def determine_cmake_library_path
sdk = MacOS.sdk_path if MacSystem.xcode43_without_clt? sdk = MacOS.sdk_path if MacSystem.xcode43_without_clt?
paths = []
# things expect to find GL headers since X11 used to be a default, so we add them # things expect to find GL headers since X11 used to be a default, so we add them
%W{#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries}.to_path_s paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
paths << "#{MacSystem.x11_prefix}/lib" if x11?
paths.to_path_s
end end
def determine_aclocal_path def determine_aclocal_path