mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-15 16:09:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch #428494: Prefer linking against ncursesw over ncurses library

Browse source
This commit is contained in:
Martin v. Löwis 2006-02-11 15:55:14 +00:00
parent b69406dc09
commit a55e55e9f3
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -699,6 +699,8 @@ Library
Build Build
----- -----
- Patch #1428494: Prefer linking against ncursesw over ncurses library.
- Patch #881820: look for openpty and forkpty also in libbsd. - Patch #881820: look for openpty and forkpty also in libbsd.
- The sources of zlib are now part of the Python distribution (zlib 1.2.3). - The sources of zlib are now part of the Python distribution (zlib 1.2.3).

9
setup.py
View file

@ -450,6 +450,9 @@ class PyBuildExt(build_ext):
if self.compiler.find_library_file(lib_dirs, 'readline'): if self.compiler.find_library_file(lib_dirs, 'readline'):
readline_libs = ['readline'] readline_libs = ['readline']
if self.compiler.find_library_file(lib_dirs, if self.compiler.find_library_file(lib_dirs,
'ncursesw'):
readline_libs.append('ncursesw')
elif self.compiler.find_library_file(lib_dirs,
'ncurses'): 'ncurses'):
readline_libs.append('ncurses') readline_libs.append('ncurses')
elif self.compiler.find_library_file(lib_dirs, 'curses'): elif self.compiler.find_library_file(lib_dirs, 'curses'):
@ -751,7 +754,11 @@ class PyBuildExt(build_ext):
# Curses support, requiring the System V version of curses, often # Curses support, requiring the System V version of curses, often
# provided by the ncurses library. # provided by the ncurses library.
if (self.compiler.find_library_file(lib_dirs, 'ncurses')): if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
curses_libs = ['ncursesw']
exts.append( Extension('_curses', ['_cursesmodule.c'],
libraries = curses_libs) )
elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
curses_libs = ['ncurses'] curses_libs = ['ncurses']
exts.append( Extension('_curses', ['_cursesmodule.c'], exts.append( Extension('_curses', ['_cursesmodule.c'],
libraries = curses_libs) ) libraries = curses_libs) )