summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier de Gaye <xdegaye@users.sourceforge.net>2016-12-13 15:04:14 (GMT)
committerXavier de Gaye <xdegaye@users.sourceforge.net>2016-12-13 15:04:14 (GMT)
commite13c3201fb66c4c211b4ebb7604d1435bedc1015 (patch)
treed088f408f51f9b32a82c7e6a2d29c47b0d6dd1d1
parent3a4e989324cc1f75c9f749c9e1c20de2f43df6e3 (diff)
downloadcpython-e13c3201fb66c4c211b4ebb7604d1435bedc1015.zip
cpython-e13c3201fb66c4c211b4ebb7604d1435bedc1015.tar.gz
cpython-e13c3201fb66c4c211b4ebb7604d1435bedc1015.tar.bz2
Issue #28190: Cross compiling the _curses module does not use anymore
/usr/include/ncursesw as a headers search path.
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac4
-rw-r--r--setup.py3
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'