aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/requirements/python_dependency.rb
diff options
context:
space:
mode:
authorSamuel John2013-06-06 12:31:55 +0200
committerSamuel John2013-06-06 12:33:28 +0200
commit02ddd442f2334dbed26aa9988127b54f3362e916 (patch)
tree5b6847059e3d9a40a8c95aec616fee5f9d7c704b /Library/Homebrew/requirements/python_dependency.rb
parent86fb9e7294e1b1cd06fa5f0890ef6874ee7f3eb0 (diff)
downloadhomebrew-02ddd442f2334dbed26aa9988127b54f3362e916.tar.bz2
PythonInstalled: Don't require superenv
* The python do ... end block does no longer require 'superenv' but saves and restores the ENV by using ENV.to_hash and `ensure`. This should resolve some build problems with formulae using `env :std`! * `python_helper` is now in a module `Python`. * Imporoved some comments in python_dependency.rb
Diffstat (limited to 'Library/Homebrew/requirements/python_dependency.rb')
-rw-r--r--Library/Homebrew/requirements/python_dependency.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_dependency.rb
index 962b111d2..74bf1a1a8 100644
--- a/Library/Homebrew/requirements/python_dependency.rb
+++ b/Library/Homebrew/requirements/python_dependency.rb
@@ -128,8 +128,8 @@ class PythonInstalled < Requirement
"python#{version.major}.#{version.minor}"
end
- # Homebrew's global site-packages. The local ones are populated by the
- # python_helper method when the `prefix` of a formula is known.
+ # Homebrew's global site-packages. The local ones (just `site_packages`) are
+ # populated by the python_helper method when the `prefix` of a formula is known.
def global_site_packages
HOMEBREW_PREFIX/"lib/#{xy}/site-packages"
end
@@ -230,7 +230,7 @@ class PythonInstalled < Requirement
ENV.append 'CMAKE_INCLUDE_PATH', incdir, ':'
ENV.append 'PKG_CONFIG_PATH', pkg_config_path, ':' if pkg_config_path
# We don't set the -F#{framework} here, because if Python 2.x and 3.x are
- # used, `Python.framework` is ambuig. However, in the `python do` block
+ # used, `Python.framework` is ambiguous. However, in the `python do` block
# we can set LDFLAGS+="-F#{framework}" because only one is temporarily set.
# Udpate distutils.cfg (later we can remove this, but people still have