Python add -F#{python.framework} for brewed Python

Since Python has been removed from superenv and
added as an explicit `depends_on :python`,
we should add
`-F#{HOMEBREW_PREFIX}/opt/python/Framewoks`
so that build tools that don't use
`python-config --ldflags` (as they should!)
can link against brewed Python.

3 files changed, 11 insertions, 4 deletions

diff --git a/Library/Homebrew/python_helper.rb b/Library/Homebrew/python_helper.rb
index d17bbacee..992ef43c1 100644
--- a/Library/Homebrew/python_helper.rb
+++ b/Library/Homebrew/python_helper.rb
@@ -64,6 +64,7 @@ def python_helper(options={:allowed_major_versions => [2, 3]}, &block)
           ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, ':'
           ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, ':' if py.pkg_config_path
           ENV.prepend 'PATH', py.binary.dirname, ':' unless py.from_osx?
+          ENV.prepend 'LDFLAGS', "-F#{py.framework}" if py.brewed?
           # Track the state of the currently selected python for this block,
           # so if this python_helper is called again _inside_ the block, we can
           # just return the right python (see `else`-branch a few lines down):
diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_dependency.rb
index c7b156798..7b86b34a9 100644
--- a/Library/Homebrew/requirements/python_dependency.rb
+++ b/Library/Homebrew/requirements/python_dependency.rb
@@ -177,10 +177,14 @@ class PythonInstalled < Requirement
     @pypy ||= !(`#{binary} -c "import sys; print(sys.version)"`.downcase =~ /.*pypy.*/).nil?
   end
 
-  # Is this python a framework-style install (OS X only)?
-  def framework?
-    @framework ||= /Python[0-9]*\.framework/ === prefix.to_s
+  def framework
+    # We return the path to Frameworks and not the 'Python.framework', because
+    # the latter is (sadly) the same for 2.x and 3.x.
+    if prefix.to_s =~ /^(.*\/Frameworks)\/(Python\.framework).*$/
+      @framework = $1
+    end
   end
+  def framework?; not framework.nil? end
 
   def universal?
     @universal ||= archs_for_command(binary).universal?
@@ -215,6 +219,9 @@ class PythonInstalled < Requirement
     # ENV['ARCHFLAGS'] = ??? # FIXME
     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
+    # we can set LDFLAGS+="-F#{framework}" because only one is temporarily set.
 
     # Udpate distutils.cfg (later we can remove this, but people still have
     # their old brewed pythons and we have to update it here)
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 77b121155..1fa43cf2a 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -161,7 +161,6 @@ class << ENV
   def determine_cmake_frameworks_path
     # XXX: keg_only_deps perhaps? but Qt does not link its Frameworks because of Ruby's Find.find ignoring symlinks!!
     paths = deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/Frameworks" }
-    paths << "#{HOMEBREW_PREFIX}/Frameworks"
     paths << "#{MacOS.sdk_path}/System/Library/Frameworks" if MacSystem.xcode43_without_clt?
     paths.to_path_s
   end