cpython: 8c78d844d6f0 (original) (raw)

Mercurial > cpython

changeset 105606:8c78d844d6f0 3.6

Issue #28190: Cross compiling the _curses module does not use anymore /usr/include/ncursesw as a headers search path. [#28190]

Xavier de Gaye xdegaye@users.sourceforge.net
date	Tue, 13 Dec 2016 16:04:14 +0100
parents	43f9366d8883
children	bdf92b4e02f2 0528a6743018
files	configure configure.ac setup.py
diffstat	3 files changed, 8 insertions(+), 3 deletions(-)[+] [-] configure 4 configure.ac 4 setup.py 3

line wrap: on

line diff

--- 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 :

--- 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)

--- 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')[](#l3.7)

```
       if not cross_compiling:[](#l3.8)
```

           curses_includes.append('/usr/include/ncursesw')[](#l3.9)
       # Bug 1464056: If _curses.so links with ncursesw,[](#l3.10)
       # _curses_panel.so must link with panelw.[](#l3.11)
       panel_library = 'panelw'[](#l3.12)