From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 4 Mar 2009 21:33:19 +0000 (+0000)
Subject: Merged revisions 70174 via svnmerge from
X-Git-Tag: 3.0~342
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8cf4cae7d9d8d1209c2b065f6746b7009bceb48;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 70174 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r70174 | ronald.oussoren | 2009-03-04 22:32:48 +0100 (Wed, 04 Mar 2009) | 14 lines

  Merged revisions 70172 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r70172 | ronald.oussoren | 2009-03-04 22:30:12 +0100 (Wed, 04 Mar 2009) | 7 lines

    Change framework search order when looking for Tcl/Tk on OSX.

    This is needed because the system linker looks in /Library/Framework before
    it looks in /System/Library frameworks. Without this patch _tkinter will
    be unusable when it is compiled on a system that has Tk 8.5 installed in
    /Library/Frameworks (and the Apple 8.4 install in /System/Library/Frameworks)
  ........
................
---

diff --git a/setup.py b/setup.py
index 82e6a4d00877..d7bdf770a217 100644
--- a/setup.py
+++ b/setup.py
@@ -1097,8 +1097,8 @@ class PyBuildExt(build_ext):
         # different the UNIX search logic is not sharable.
         from os.path import join, exists
         framework_dirs = [
-            '/System/Library/Frameworks/',
             '/Library/Frameworks',
+            '/System/Library/Frameworks/',
             join(os.getenv('HOME'), '/Library/Frameworks')
         ]