mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-17 15:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78784 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Ronald Oussoren 2010-03-08 07:08:25 +00:00
parent 0941621106
commit 59f3def33b
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
setup.py
View file

@ -558,6 +558,9 @@ class PyBuildExt(build_ext):
do_readline = self.compiler.find_library_file(lib_dirs, 'readline') do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
if platform == 'darwin': if platform == 'darwin':
os_release = int(os.uname()[2].split('.')[0]) 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: if os_release < 9:
# MacOSX 10.4 has a broken readline. Don't try to build # MacOSX 10.4 has a broken readline. Don't try to build
# the readline module unless the user has installed a fixed # 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 if platform == 'darwin' and ("--disable-toolbox-glue" not in
sysconfig.get_config_var("CONFIG_ARGS")): 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 # We're on Mac OS X 10.4 or later, the compiler should
# support '-Wno-deprecated-declarations'. This will # support '-Wno-deprecated-declarations'. This will
# surpress deprecation warnings for the Carbon extensions, # surpress deprecation warnings for the Carbon extensions,