diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-04 21:30:52 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-04 21:30:52 (GMT) |
| commit | 5302a3011e06ad87b08855d37a230e45df596325 (patch) | |
| tree | 87fdf4ffebd9a2bde92c161e9d733209b4724f43 | |
| parent | 6f64894a92e69d33b43089d100387d87f019f332 (diff) | |
| download | cpython-5302a3011e06ad87b08855d37a230e45df596325.zip cpython-5302a3011e06ad87b08855d37a230e45df596325.tar.gz cpython-5302a3011e06ad87b08855d37a230e45df596325.tar.bz2 | |
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)
........
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1450,8 +1450,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') ] |