Kaydet (Commit) 61f5f013 authored tarafından Stefan Krah's avatar Stefan Krah

Merged revisions 82927 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82927 | stefan.krah | 2010-07-17 13:46:52 +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.
........
üst 6d4a06c9
...@@ -547,18 +547,19 @@ class PyBuildExt(build_ext): ...@@ -547,18 +547,19 @@ class PyBuildExt(build_ext):
tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib') tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib')
if not os.path.exists(self.build_temp): if not os.path.exists(self.build_temp):
os.makedirs(self.build_temp) os.makedirs(self.build_temp)
os.system("ldd %s > %s" % (do_readline, tmpfile)) ret = os.system("ldd %s > %s" % (do_readline, tmpfile))
fp = open(tmpfile) if ret >> 8 == 0:
for ln in fp: fp = open(tmpfile)
if 'curses' in ln: for ln in fp:
readline_termcap_library = re.sub( if 'curses' in ln:
r'.*lib(n?cursesw?)\.so.*', r'\1', ln readline_termcap_library = re.sub(
).rstrip() r'.*lib(n?cursesw?)\.so.*', r'\1', ln
break ).rstrip()
if 'tinfo' in ln: # termcap interface split out from ncurses break
readline_termcap_library = 'tinfo' if 'tinfo' in ln: # termcap interface split out from ncurses
break readline_termcap_library = 'tinfo'
fp.close() break
fp.close()
os.unlink(tmpfile) os.unlink(tmpfile)
# Issue 7384: If readline is already linked against curses, # Issue 7384: If readline is already linked against curses,
# use the same library for the readline and curses modules. # use the same library for the readline and curses modules.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment