[pypy-commit] pypy default: issue 3144: version was not being updated, and was the wrong thing to check anyway

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r98504:580ac8d8c1af
Date: 2020-01-10 10:44 +0800
http://bitbucket.org/pypy/pypy/changeset/580ac8d8c1af/

Log:	issue 3144: version was not being updated, and was the wrong thing
	to check anyway

diff --git a/lib_pypy/_curses_build.py b/lib_pypy/_curses_build.py
--- a/lib_pypy/_curses_build.py
+++ b/lib_pypy/_curses_build.py
@@ -6,9 +6,7 @@
     static const int NCURSES_VERSION_MINOR;
 '''
 
-version = (0, 0)
 def find_library(options):
-    global version
     for library in options:
         ffi = FFI()
         ffi.cdef(version_str)
@@ -17,7 +15,6 @@
             ffi.compile()
             import _curses_cffi_check
             lib = _curses_cffi_check.lib
-            version = (lib.NCURSES_VERSION_MAJOR, lib.NCURSES_VERSION_MINOR)
         except VerificationError as e:
             e_last = e
             continue
@@ -41,6 +38,7 @@
     include_dirs = [os.path.join(base, 'include', name)]
     library_dirs = [os.path.join(base, 'lib')]
     libs = [name, name.replace('ncurses', 'panel')]
+    print('found base', base, name, libs)
 else:
     include_dirs = []
     library_dirs = []
@@ -385,7 +383,7 @@
 void _m_getsyx(int *yx);
 """)
 
-if version > (5, 7):
+if 'ncursesw' in libs:
     ffi.cdef("""
 typedef int... wint_t;
 int wget_wch(WINDOW *, wint_t *);