Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r97892:140497be04d3
Date: 2019-10-30 18:52 +0200
http://bitbucket.org/pypy/pypy/changeset/140497be04d3/
Log: issue 2970: add ncursesw to _minimal_curses
diff --git a/lib_pypy/pyrepl/_minimal_curses.py
b/lib_pypy/pyrepl/_minimal_curses.py
--- a/lib_pypy/pyrepl/_minimal_curses.py
+++ b/lib_pypy/pyrepl/_minimal_curses.py
@@ -16,7 +16,7 @@
def _find_clib():
- trylibs = ['ncurses', 'curses']
+ trylibs = ['ncursesw', 'ncurses', 'curses']
for lib in trylibs:
path = ctypes.util.find_library(lib)
diff --git a/pypy/module/_minimal_curses/fficurses.py
b/pypy/module/_minimal_curses/fficurses.py
--- a/pypy/module/_minimal_curses/fficurses.py
+++ b/pypy/module/_minimal_curses/fficurses.py
@@ -14,6 +14,8 @@
yield ExternalCompilationInfo(includes=['curses.h', 'term.h'])
yield ExternalCompilationInfo(includes=['curses.h', 'term.h'],
include_dirs=['/usr/include/ncurses'])
+ yield ExternalCompilationInfo(includes=['curses.h', 'term.h'],
+ include_dirs=['/usr/include/ncursesw'])
yield ExternalCompilationInfo(includes=['ncurses/curses.h',
'ncurses/term.h'])
@@ -23,6 +25,8 @@
yield ExternalCompilationInfo(libraries=['ncurses'])
yield ExternalCompilationInfo(libraries=['ncurses'],
library_dirs=['/usr/lib64'])
+ yield ExternalCompilationInfo(libraries=['ncursesw'],
+ library_dirs=['/usr/lib64'])
def try_tools():
try:
@@ -30,6 +34,10 @@
except Exception:
pass
try:
+ yield ExternalCompilationInfo.from_pkg_config("ncursesw")
+ except Exception:
+ pass
+ try:
yield ExternalCompilationInfo.from_config_tool("ncurses5-config")
except Exception:
pass
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
