Mercurial > cpython-lru_cache-weakref
diff setup.py @ 56135:1c50dc213312
Merged revisions 74970 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74970 | ronald.oussoren | 2009-09-20 16:18:15 +0200 (Sun, 20 Sep 2009) | 7 lines
Issue 6877: this patch makes it possible to link the readline extension
to the libedit emulation of the readline API on OSX 10.5 or later.
This also adds a minimal testsuite for readline to check that the
history manipuation functions have the same interface with both
C libraries.
........
| author | Ronald Oussoren <ronaldoussoren@mac.com> |
|---|---|
| date | Sun, 20 Sep 2009 14:53:22 +0000 |
| parents | 850dafd4a245 |
| children | 14b55a4e8725 |
line wrap: on
line diff
--- a/setup.py Sun Sep 20 11:22:29 2009 +0000 +++ b/setup.py Sun Sep 20 14:53:22 2009 +0000 @@ -493,16 +493,16 @@ # readline do_readline = self.compiler_obj.find_library_file(lib_dirs, 'readline') - if platform == 'darwin': # and os.uname()[2] < '9.': - # MacOSX 10.4 has a broken readline. Don't try to build - # the readline module unless the user has installed a fixed - # readline package - # FIXME: The readline emulation on 10.5 is better, but the - # readline module doesn't compile out of the box. - if find_file('readline/rlconf.h', inc_dirs, []) is None: - do_readline = False + if platform == 'darwin': + os_release = int(os.uname()[2].split('.')[0]) + 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 + # readline package + if find_file('readline/rlconf.h', inc_dirs, []) is None: + do_readline = False if do_readline: - if sys.platform == 'darwin': + if platform == 'darwin' and os_release < 9: # In every directory on the search path search for a dynamic # library and then a static library, instead of first looking # for dynamic libraries on the entire path.