pythongh-90005: Port readline and curses to PY_STDLIB_MOD

tiran · Jul 1, 2022 · 4c97453 · 4c97453
1 parent ec5e253
commit 4c97453
Show file tree

Hide file tree

Showing 6 changed files with 1,756 additions and 568 deletions.
diff --git a/Misc/NEWS.d/next/Build/2022-06-30-17-18-23.gh-issue-90005.EIOOla.rst b/Misc/NEWS.d/next/Build/2022-06-30-17-18-23.gh-issue-90005.EIOOla.rst
@@ -0,0 +1,4 @@
+Dependencies of :mod:`readline` and :mod:`curses` module are now detected in
+``configure`` script with ``pkg-config``. Only ``ncurses`` / ``ncursesw``
+are detected automatically. The old ``curses`` library is not configured
+automatically.
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
@@ -72,8 +72,8 @@
 # gdbm module needs -lgdbm
 @MODULE__GDBM_TRUE@_gdbm _gdbmmodule.c
 
-# needs -lreadline or -leditline, sometimes termcap, termlib, or tinfo
-#@MODULE_READLINE_TRUE@readline readline.c
+# needs -lreadline or -ledit, sometimes termcap, termlib, or tinfo
+@MODULE_READLINE_TRUE@readline readline.c
 
 # hashing builtins, can be disabled with --without-builtin-hashlib-hashes
 @MODULE__MD5_TRUE@_md5 md5module.c
@@ -138,10 +138,10 @@
 # needs -lffi and -ldl
 @MODULE__CTYPES_TRUE@_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c @MODULE__CTYPES_MALLOC_CLOSURE@
 
-# needs -lncurses, -lncursesw or -lcurses, sometimes -ltermcap
-#@MODULE__CURSES_TRUE@_curses _cursesmodule.c
-# needs -lncurses and -lpanel
-#@MODULE__CURSES_PANEL_TRUE@_curses_panel _curses_panel.c
+# needs -lncurses[w], sometimes -ltermcap/tinfo
+@MODULE__CURSES_TRUE@_curses _cursesmodule.c
+# needs -lncurses[w] and -lpanel[w]
+@MODULE__CURSES_PANEL_TRUE@_curses_panel _curses_panel.c
 
 @MODULE__SQLITE3_TRUE@_sqlite3 _sqlite/blob.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c