[Python-checkins] r70173 - in python/branches/release26-maint: setup.py
ronald.oussoren
python-checkins at python.org
Wed Mar 4 22:30:53 CET 2009
Author: ronald.oussoren
Date: Wed Mar 4 22:30:52 2009
New Revision: 70173
Log:
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)
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/setup.py
Modified: python/branches/release26-maint/setup.py
==============================================================================
--- python/branches/release26-maint/setup.py (original)
+++ python/branches/release26-maint/setup.py Wed Mar 4 22:30:52 2009
@@ -1450,8 +1450,8 @@
# 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')
]
More information about the Python-checkins
mailing list