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

PythonInstalled: set PYTHONPATH, not prepend

Browse Source 
An issue could arise when brewing a formula that
has Python 2.x and 3.x support and 2.x is the system Python
but 3.x is a brewed one. The idea about prepending was that
user configured PYTHONPATH could be used in formulae.
Now, instead and if needed, inside the `python do` block
one can still append to PYTHONPATH.
This commit is contained in:
Samuel John 2013-08-27 16:29:07 +02:00
parent 2e2e46b5b4
commit ed461359a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/python_helper.rb
View File

@ -60,9 +60,9 @@ def python_helper(options={:allowed_major_versions => [2, 3]}, &block)
# In order to install into the Cellar, the dir must exist and be in the
# PYTHONPATH. This will be executed in the context of the formula
# 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: setting PYTHONPATH to: #{py.site_packages}" if ARGV.verbose?
mkdir_p py.site_packages
ENV.prepend_path 'PYTHONPATH', py.site_packages
ENV['PYTHONPATH'] = py.site_packages
ENV['PYTHON'] = py.binary
ENV.prepend_path 'CMAKE_INCLUDE_PATH', py.incdir
ENV.prepend_path 'PKG_CONFIG_PATH', py.pkg_config_path if py.pkg_config_path