changeset: 78330:e0eb7dea245f
branch: 2.7
parent: 78326:7232d544c811
user: Ned Deily <nad@acm.org>
date: Mon Jul 30 04:07:49 2012 -0700
files: Misc/NEWS setup.py
description:
Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
diff -r 7232d544c811 -r e0eb7dea245f Misc/NEWS
--- a/Misc/NEWS	Mon Jul 30 03:28:22 2012 -0700
+++ b/Misc/NEWS	Mon Jul 30 04:07:49 2012 -0700
@@ -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 -r 7232d544c811 -r e0eb7dea245f setup.py
--- a/setup.py	Mon Jul 30 03:28:22 2012 -0700
+++ b/setup.py	Mon Jul 30 04:07:49 2012 -0700
@@ -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,
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/e0eb7dea245f">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/e0eb7dea245f" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>