From 5f734f1b136529a3a17a3eff12cbad72c056f6e1 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 4 Mar 2009 21:32:48 +0000 Subject: 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) ........ --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 712f54c..522eb82 100644 --- a/setup.py +++ b/setup.py @@ -1083,8 +1083,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') ] -- cgit v0.12