[Python-checkins] cpython (3.6): Issue #28190: Cross compiling the _curses module does not use anymore

Tue Dec 13 10:06:36 EST 2016

https://hg.python.org/cpython/rev/8c78d844d6f0
changeset: 105606:8c78d844d6f0
branch: 3.6
parent: 105604:43f9366d8883
user: Xavier de Gaye <xdegaye at users.sourceforge.net>
date: Tue Dec 13 16:04:14 2016 +0100
summary:
 Issue #28190: Cross compiling the _curses module does not use anymore
/usr/include/ncursesw as a headers search path.
files:
 configure | 4 +++-
 configure.ac | 4 +++-
 setup.py | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -15690,7 +15690,9 @@
 
 # first curses header check
 ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+if test "$cross_compiling" = no; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+fi
 
 for ac_header in curses.h ncurses.h
 do :
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -4885,7 +4885,9 @@
 
 # first curses header check
 ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+if test "$cross_compiling" = no; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+fi
 
 AC_CHECK_HEADERS(curses.h ncurses.h)
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1349,7 +1349,8 @@
 panel_library = 'panel'
 if curses_library == 'ncursesw':
 curses_defines.append(('HAVE_NCURSESW', '1'))
- curses_includes.append('/usr/include/ncursesw')
+ if not cross_compiling:
+ curses_includes.append('/usr/include/ncursesw')
 # Bug 1464056: If _curses.so links with ncursesw,
 # _curses_panel.so must link with panelw.
 panel_library = 'panelw'
-- 
Repository URL: https://hg.python.org/cpython
