python-checkins at python
Jul 30, 2012, 4:21 AM
Post #1 of 1
(36 views)
Permalink
|
|
cpython (2.7): Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
|
|
http://hg.python.org/cpython/rev/e0eb7dea245f
changeset: 78330:e0eb7dea245f
branch: 2.7
parent: 78326:7232d544c811
user: Ned Deily <nad [at] acm>
date: Mon Jul 30 04:07:49 2012 -0700
summary:
Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
files:
Misc/NEWS | 2 ++
setup.py | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -309,6 +309,8 @@
Build
-----
+- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
+
- Issue #8767: Restore building with --disable-unicode.
Patch by Stefano Taschini.
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -48,6 +48,9 @@
Returns True if 'path' can be located in an OSX SDK
"""
return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
+ return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
+ or path.startswith('/System/')
+ or path.startswith('/Library/') )
def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located,
--
Repository URL: http://hg.python.org/cpython
|
