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

Put /usr/X11/bin in PATH when requesting X11.

Browse Source
This commit is contained in:
Adam Vandenberg 2010-08-07 16:50:45 -07:00
parent 74727560ee
commit 57bbeb3bd7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/extend/ENV.rb
View File

@ -151,9 +151,12 @@ module HomebrewEnvExtension
def libxml2 def libxml2
append_to_cflags ' -I/usr/include/libxml2' append_to_cflags ' -I/usr/include/libxml2'
end end
def x11 def x11
opoo "You do not have X11 installed, this formula may not build." if not x11_installed? opoo "You do not have X11 installed, this formula may not build." if not x11_installed?
# There are some config scripts (e.g. freetype) here that should go in the path
ENV.prepend 'PATH', '/usr/X11/bin', ':'
# CPPFLAGS are the C-PreProcessor flags, *not* C++! # CPPFLAGS are the C-PreProcessor flags, *not* C++!
append 'CPPFLAGS', '-I/usr/X11R6/include' append 'CPPFLAGS', '-I/usr/X11R6/include'
append 'LDFLAGS', '-L/usr/X11R6/lib' append 'LDFLAGS', '-L/usr/X11R6/lib'
@ -161,6 +164,7 @@ module HomebrewEnvExtension
append 'CMAKE_PREFIX_PATH', '/usr/X11R6', ':' append 'CMAKE_PREFIX_PATH', '/usr/X11R6', ':'
end end
alias_method :libpng, :x11 alias_method :libpng, :x11
# we've seen some packages fail to build when warnings are disabled! # we've seen some packages fail to build when warnings are disabled!
def enable_warnings def enable_warnings
remove_from_cflags '-w' remove_from_cflags '-w'