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

ENV: Use /usr/X11 instead of symlink

Browse Source
This commit is contained in:
Adam Vandenberg 2011-04-18 10:25:51 -07:00
parent 5a10cc8e76
commit 90bacc913f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,12 +39,12 @@ module HomebrewEnvExtension
# don't react properly to that. # don't react properly to that.
self['LD'] = self['CC'] self['LD'] = self['CC']
# optimise all the way to eleven, references: # Optimise all the way to eleven, references:
# http://en.gentoo-wiki.com/wiki/Safe_Cflags/Intel # http://en.gentoo-wiki.com/wiki/Safe_Cflags/Intel
# http://forums.mozillazine.org/viewtopic.php?f=12&t=577299 # http://forums.mozillazine.org/viewtopic.php?f=12&t=577299
# http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/i386-and-x86_002d64-Options.html # http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/i386-and-x86_002d64-Options.html
# we don't set, eg. -msse3 because the march flag does that for us # We don't set, eg. -msse3 because the march flag does that for us:
# http://gcc.gnu.org/onlinedocs/gcc-4.3.3/gcc/i386-and-x86_002d64-Options.html # http://gcc.gnu.org/onlinedocs/gcc-4.3.3/gcc/i386-and-x86_002d64-Options.html
if MACOS_VERSION >= 10.6 if MACOS_VERSION >= 10.6
case Hardware.intel_family case Hardware.intel_family
when :nehalem, :penryn, :core2 when :nehalem, :penryn, :core2
@ -206,10 +206,10 @@ Please take one of the following actions:
# There are some config scripts (e.g. freetype) here that should go in the path # There are some config scripts (e.g. freetype) here that should go in the path
prepend 'PATH', '/usr/X11/bin', ':' 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/X11/include'
append 'LDFLAGS', '-L/usr/X11R6/lib' append 'LDFLAGS', '-L/usr/X11/lib'
# CMake ignores the variables above # CMake ignores the variables above
append 'CMAKE_PREFIX_PATH', '/usr/X11R6', ':' append 'CMAKE_PREFIX_PATH', '/usr/X11', ':'
end end
alias_method :libpng, :x11 alias_method :libpng, :x11