[Python-checkins] cpython (merge 3.6 -> default): Issue #28190: Merge 3.6.
xavier.degaye
python-checkins at python.org
Tue Dec 13 10:06:20 EST 2016
https://hg.python.org/cpython/rev/bdf92b4e02f2
changeset: 105607:bdf92b4e02f2
parent: 105605:db1d20825d71
parent: 105606:8c78d844d6f0
user: Xavier de Gaye <xdegaye at users.sourceforge.net>
date: Tue Dec 13 16:05:15 2016 +0100
summary:
Issue #28190: Merge 3.6.
files:
configure | 4 +++-
configure.ac | 4 +++-
setup.py | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -15706,7 +15706,9 @@
# 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
--- a/configure.ac
+++ b/configure.ac
@@ -4889,7 +4889,9 @@
# 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
--- a/setup.py
+++ b/setup.py
@@ -1350,7 +1350,8 @@
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'
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list