From e13c3201fb66c4c211b4ebb7604d1435bedc1015 Mon Sep 17 00:00:00 2001 From: Xavier de Gaye Date: Tue, 13 Dec 2016 16:04:14 +0100 Subject: Issue #28190: Cross compiling the _curses module does not use anymore /usr/include/ncursesw as a headers search path. --- configure | 4 +++- configure.ac | 4 +++- setup.py | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 82323f5..43f342e 100755 --- a/configure +++ b/configure @@ -15690,7 +15690,9 @@ fi # 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 index 4ab1892..af54092 100644 --- a/configure.ac +++ b/configure.ac @@ -4885,7 +4885,9 @@ fi # 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 index 116f06f..7cb1141 100644 --- a/setup.py +++ b/setup.py @@ -1349,7 +1349,8 @@ class PyBuildExt(build_ext): 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' -- cgit v0.12