diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-13 16:05:15 +0100 |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-13 16:05:15 +0100 |
| commit | f191a9e8e4f3fbcf018fac4996d764c2b9d60800 (patch) | |
| tree | e2a8663f5a61e01b512d57618cc5b5b3c32d56b3 | |
| parent | f852fff878a578bef805310b0bfb7cbd1980e689 (diff) | |
| parent | e13c3201fb66c4c211b4ebb7604d1435bedc1015 (diff) | |
| download | cpython-git-f191a9e8e4f3fbcf018fac4996d764c2b9d60800.tar.gz | |
Issue #28190: Merge 3.6.
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | setup.py | 3 |
3 files changed, 8 insertions, 3 deletions
@@ -15706,7 +15706,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 7f4713b195..1547de59d0 100644 --- a/configure.ac +++ b/configure.ac @@ -4889,7 +4889,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) @@ -1350,7 +1350,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' |