[pypy-commit] pypy py3.6: merge default into py3.6

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r98248:c7b17edd132e
Date: 2019-12-07 19:36 +0200
http://bitbucket.org/pypy/pypy/changeset/c7b17edd132e/

Log:	merge default into py3.6

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
@@ -5,13 +5,6 @@
 from rpython.rtyper.tool import rffi_platform
 from rpython.translator.tool.cbuild import ExternalCompilationInfo
 
-# We cannot trust ncurses5-config, it's broken in various ways in
-# various versions.  For example it might not list -ltinfo even though
-# it's needed, or --cflags might be completely empty. Crap.
-
-except IOError:
-    pass
-
 def try_cflags():
     yield ExternalCompilationInfo(includes=['curses.h', 'term.h'])
     yield ExternalCompilationInfo(includes=['curses.h', 'term.h'],
@@ -33,7 +26,11 @@
 
 def try_tools():
     try:
-        yield ExternalCompilationInfo.from_pkg_config("ncurses")
+        yield ExternalCompilationInfo.from_config_tool("ncursesw6-config")
+    except Exception:
+        pass
+    try:
+        yield ExternalCompilationInfo.from_config_tool("ncurses5-config")
     except Exception:
         pass
     try:
@@ -41,7 +38,7 @@
     except Exception:
         pass
     try:
-        yield ExternalCompilationInfo.from_config_tool("ncurses5-config")
+        yield ExternalCompilationInfo.from_pkg_config("ncursesw")
     except Exception:
         pass