mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 01:35:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 82929 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82929 | stefan.krah | 2010-07-17 14:21:08 +0200 (Sat, 17 Jul 2010) | 4 lines

  Issue #7384: On Gentoo, libreadline.so is a "fake library", so ldd fails.
  In that case, do not attempt to parse stderr output.
........
This commit is contained in:
Stefan Krah 2010-07-17 12:31:09 +00:00
parent edc0d2338d
commit 818ea8ed11
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
setup.py
View file

@ -607,7 +607,10 @@ class PyBuildExt(build_ext):
# Determine if readline is already linked against curses or tinfo.
if do_readline and find_executable('ldd'):
fp = os.popen("ldd %s" % do_readline)
for ln in fp:
ldd_output = fp.readlines()
ret = fp.close()
if ret is None or ret >> 8 == 0:
for ln in ldd_output:
if 'curses' in ln:
readline_termcap_library = re.sub(
r'.*lib(n?cursesw?)\.so.*', r'\1', ln
@ -616,7 +619,6 @@ class PyBuildExt(build_ext):
if 'tinfo' in ln: # termcap interface split out from ncurses
readline_termcap_library = 'tinfo'
break
fp.close()
# Issue 7384: If readline is already linked against curses,
# use the same library for the readline and curses modules.
# Disabled since applications relying on ncursesw might break.