| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 1 | From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Sun, 16 Feb 2020 17:50:25 +0100 |
| 4 | Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from |
| 5 | the host |
| 6 | |
| 7 | This leads to host contamination, and particularly can cause |
| 8 | curses modules to fail at runtime if the host curses is configured |
| 9 | differently to native curses (observed on current OpenSuse Tumbleweed |
| 10 | as dnf failures). |
| 11 | |
| 12 | Upstream-Status: Inappropriate [oe-core specific] |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | configure.ac | 6 ------ |
| 16 | setup.py | 2 -- |
| 17 | 2 files changed, 8 deletions(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index 915f475..c911011 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -4828,12 +4828,6 @@ then |
| 24 | [Define if you have struct stat.st_mtimensec]) |
| 25 | fi |
| 26 | |
| 27 | -# first curses header check |
| 28 | -ac_save_cppflags="$CPPFLAGS" |
| 29 | -if test "$cross_compiling" = no; then |
| 30 | - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
| 31 | -fi |
| 32 | - |
| 33 | AC_CHECK_HEADERS(curses.h ncurses.h) |
| 34 | |
| 35 | # On Solaris, term.h requires curses.h |
| 36 | diff --git a/setup.py b/setup.py |
| 37 | index b0f1541..7208cd0 100644 |
| 38 | --- a/setup.py |
| 39 | +++ b/setup.py |
| 40 | @@ -973,8 +973,6 @@ class PyBuildExt(build_ext): |
| 41 | panel_library = 'panel' |
| 42 | if curses_library == 'ncursesw': |
| 43 | curses_defines.append(('HAVE_NCURSESW', '1')) |
| 44 | - if not CROSS_COMPILING: |
| 45 | - curses_includes.append('/usr/include/ncursesw') |
| 46 | # Bug 1464056: If _curses.so links with ncursesw, |
| 47 | # _curses_panel.so must link with panelw. |
| 48 | panel_library = 'panelw' |