[Python-checkins] r78785 - in python/branches/release26-maint: setup.py

ronald.oussoren python-checkins at python.org
Mon Mar 8 08:08:25 CET 2010


Author: ronald.oussoren
Date: Mon Mar  8 08:08:25 2010
New Revision: 78785

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/setup.py

Modified: python/branches/release26-maint/setup.py
==============================================================================
--- python/branches/release26-maint/setup.py	(original)
+++ python/branches/release26-maint/setup.py	Mon Mar  8 08:08:25 2010
@@ -558,6 +558,9 @@
         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 @@
         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,


More information about the Python-checkins mailing list