diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-03-08 07:08:25 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-03-08 07:08:25 (GMT) |
| commit | 59f3def33b32993127d9512694dc01a190dffb8f (patch) | |
| tree | bb20f2484a364d74c8831189fce33d3ecbdf65ca | |
| parent | 0941621106f16b2b54b8a74983bc4193ce902e4c (diff) | |
| download | cpython-59f3def33b32993127d9512694dc01a190dffb8f.zip cpython-59f3def33b32993127d9512694dc01a190dffb8f.tar.gz cpython-59f3def33b32993127d9512694dc01a190dffb8f.tar.bz2 | |
Merged revisions 78784 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78784 | ronald.oussoren | 2010-03-08 08:06:47 +0100 (Mon, 08 Mar 2010) | 3 lines
Fix for issue 8066: readline should not be linked against libedit when the
deployment target is 10.4, libedit on 10.4 is too broken.
........
| -rw-r--r-- | setup.py | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -558,6 +558,9 @@ class PyBuildExt(build_ext): do_readline = self.compiler.find_library_file(lib_dirs, 'readline') if platform == 'darwin': os_release = int(os.uname()[2].split('.')[0]) + dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') + if dep_target and dep_target.split('.') < ['10', '5']: + os_release = 8 if os_release < 9: # MacOSX 10.4 has a broken readline. Don't try to build # the readline module unless the user has installed a fixed @@ -1366,7 +1369,7 @@ class PyBuildExt(build_ext): if platform == 'darwin' and ("--disable-toolbox-glue" not in sysconfig.get_config_var("CONFIG_ARGS")): - if os.uname()[2] > '8.': + if int(os.uname()[2].split('.')[0]) >= 8: # We're on Mac OS X 10.4 or later, the compiler should # support '-Wno-deprecated-declarations'. This will # surpress deprecation warnings for the Carbon extensions, |