Skip to content

Commit e13c320

Browse files
author
Xavier de Gaye
committed
Issue python#28190: Cross compiling the _curses module does not use anymore
/usr/include/ncursesw as a headers search path.
1 parent 3a4e989 commit e13c320

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

configure

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15690,7 +15690,9 @@ fi
1569015690

1569115691
# first curses header check
1569215692
ac_save_cppflags="$CPPFLAGS"
15693-
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
15693+
if test "$cross_compiling" = no; then
15694+
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
15695+
fi
1569415696

1569515697
for ac_header in curses.h ncurses.h
1569615698
do :

configure.ac

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4885,7 +4885,9 @@ fi
48854885

48864886
# first curses header check
48874887
ac_save_cppflags="$CPPFLAGS"
4888-
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
4888+
if test "$cross_compiling" = no; then
4889+
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
4890+
fi
48894891

48904892
AC_CHECK_HEADERS(curses.h ncurses.h)
48914893

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,8 @@ class db_found(Exception): pass
13491349
panel_library = 'panel'
13501350
if curses_library == 'ncursesw':
13511351
curses_defines.append(('HAVE_NCURSESW', '1'))
1352-
curses_includes.append('/usr/include/ncursesw')
1352+
if not cross_compiling:
1353+
curses_includes.append('/usr/include/ncursesw')
13531354
# Bug 1464056: If _curses.so links with ncursesw,
13541355
# _curses_panel.so must link with panelw.
13551356
panel_library = 'panelw'

0 commit comments

Comments
 (0)