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

Use ENV.prepend_path

Browse Source
This commit is contained in:
Jack Nagel 2013-08-19 17:21:13 -05:00
parent ea8f51256b
commit 4a3dac82ef
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/ENV/shared.rb
View File

@ -73,7 +73,7 @@ module SharedEnvExtension
paths = ORIGINAL_PATHS.map { |p| p.realpath.to_s rescue nil } - %w{/usr/X11/bin /opt/X11/bin} paths = ORIGINAL_PATHS.map { |p| p.realpath.to_s rescue nil } - %w{/usr/X11/bin /opt/X11/bin}
self['PATH'] = paths.unshift(*self['PATH'].split(File::PATH_SEPARATOR)).uniq.join(File::PATH_SEPARATOR) self['PATH'] = paths.unshift(*self['PATH'].split(File::PATH_SEPARATOR)).uniq.join(File::PATH_SEPARATOR)
# XXX hot fix to prefer brewed stuff (e.g. python) over /usr/bin. # XXX hot fix to prefer brewed stuff (e.g. python) over /usr/bin.
prepend 'PATH', HOMEBREW_PREFIX/'bin', File::PATH_SEPARATOR prepend_path 'PATH', HOMEBREW_PREFIX/'bin'
end end
def fortran def fortran

8
Library/Homebrew/python_helper.rb
View File

@ -62,11 +62,11 @@ def python_helper(options={:allowed_major_versions => [2, 3]}, &block)
# so that lib points to the HOMEBREW_PREFIX/Cellar/<formula>/<version>/lib # so that lib points to the HOMEBREW_PREFIX/Cellar/<formula>/<version>/lib
puts "brew: Prepending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose? puts "brew: Prepending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose?
mkdir_p py.site_packages mkdir_p py.site_packages
ENV.prepend 'PYTHONPATH', py.site_packages, File::PATH_SEPARATOR ENV.prepend_path 'PYTHONPATH', py.site_packages
ENV['PYTHON'] = py.binary ENV['PYTHON'] = py.binary
ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, File::PATH_SEPARATOR ENV.prepend_path 'CMAKE_INCLUDE_PATH', py.incdir
ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, File::PATH_SEPARATOR if py.pkg_config_path ENV.prepend_path 'PKG_CONFIG_PATH', py.pkg_config_path if py.pkg_config_path
ENV.prepend 'PATH', py.binary.dirname, File::PATH_SEPARATOR unless py.from_osx? ENV.prepend_path 'PATH', py.binary.dirname unless py.from_osx?
#Note: Don't set LDFLAGS to point to the Python.framework, because #Note: Don't set LDFLAGS to point to the Python.framework, because
# it breaks builds (for example scipy.) # it breaks builds (for example scipy.)

2
Library/Homebrew/requirements/python_dependency.rb
View File

@ -250,7 +250,7 @@ class PythonInstalled < Requirement
file.write(sitecustomize) file.write(sitecustomize)
# For non-system python's we add the opt_prefix/bin of python to the path. # For non-system python's we add the opt_prefix/bin of python to the path.
ENV.prepend 'PATH', binary.dirname, File::PATH_SEPARATOR unless from_osx? ENV.prepend_path 'PATH', binary.dirname unless from_osx?
ENV['PYTHONHOME'] = nil # to avoid fuck-ups. ENV['PYTHONHOME'] = nil # to avoid fuck-ups.
ENV['PYTHONPATH'] = if brewed? then nil; else global_site_packages.to_s; end ENV['PYTHONPATH'] = if brewed? then nil; else global_site_packages.to_s; end