Issue #28190: Cross compiling the _curses module does not use anymore

/usr/include/ncursesw as a headers search path.

diff --git a/configure b/configure
index 82323f5ee571b6faedb598d5d5f06a7fddcad48c..43f342e6fc2e985ebaa7071412d2d2105fe8b6ec 100755 (executable)
--- 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 4ab1892928c6a45dfd473e8e09251707e19a0161..af540923ac396fa61df94431df91c0b0389c6892 100644 (file)
--- 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 116f06fb224bffb37f175fcfc504d2469c16a2ca..7cb1141dac79d4cb878e6a33753e99c5084dc502 100644 (file)
--- 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'