diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch index 30d2906439..ed1c1b9975 100644 --- a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 788cd0464ee2b175493a0167ceee8c0045ce323c Mon Sep 17 00:00:00 2001 | 1 | From 1438c3694665961aa9c478727846343ad31fa133 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Sun, 16 Feb 2020 17:50:25 +0100 | 3 | Date: Fri, 17 Nov 2023 14:16:40 +0100 |
4 | Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from | 4 | Subject: [PATCH] configure.ac: do not add a curses include path from the host |
5 | the host | ||
6 | 5 | ||
7 | This leads to host contamination, and particularly can cause | 6 | This leads to host contamination, and particularly can cause |
8 | curses modules to fail at runtime if the host curses is configured | 7 | curses modules to fail at runtime if the host curses is configured |
@@ -14,16 +13,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 13 | ||
15 | --- | 14 | --- |
16 | configure.ac | 6 ------ | 15 | configure.ac | 6 ------ |
17 | setup.py | 2 -- | 16 | 1 file changed, 6 deletions(-) |
18 | 2 files changed, 8 deletions(-) | ||
19 | 17 | ||
20 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
21 | index e5e3df8..bfdd987 100644 | 19 | index d81c19a..b15b765 100644 |
22 | --- a/configure.ac | 20 | --- a/configure.ac |
23 | +++ b/configure.ac | 21 | +++ b/configure.ac |
24 | @@ -5092,12 +5092,6 @@ then | 22 | @@ -6507,12 +6507,6 @@ AS_VAR_IF([have_panel], [no], [ |
25 | [Define if you have struct stat.st_mtimensec]) | 23 | AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) |
26 | fi | 24 | ]) |
27 | 25 | ||
28 | -# first curses header check | 26 | -# first curses header check |
29 | -ac_save_cppflags="$CPPFLAGS" | 27 | -ac_save_cppflags="$CPPFLAGS" |
@@ -31,19 +29,6 @@ index e5e3df8..bfdd987 100644 | |||
31 | - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" | 29 | - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
32 | -fi | 30 | -fi |
33 | - | 31 | - |
34 | AC_CHECK_HEADERS(curses.h ncurses.h) | ||
35 | |||
36 | # On Solaris, term.h requires curses.h | 32 | # On Solaris, term.h requires curses.h |
37 | diff --git a/setup.py b/setup.py | 33 | AC_CHECK_HEADERS([term.h], [], [], [ |
38 | index 62f0e18..c190002 100644 | 34 | #ifdef HAVE_CURSES_H |
39 | --- a/setup.py | ||
40 | +++ b/setup.py | ||
41 | @@ -1169,8 +1169,6 @@ class PyBuildExt(build_ext): | ||
42 | panel_library = 'panel' | ||
43 | if curses_library == 'ncursesw': | ||
44 | curses_defines.append(('HAVE_NCURSESW', '1')) | ||
45 | - if not CROSS_COMPILING: | ||
46 | - curses_includes.append('/usr/include/ncursesw') | ||
47 | # Bug 1464056: If _curses.so links with ncursesw, | ||
48 | # _curses_panel.so must link with panelw. | ||
49 | panel_library = 'panelw' | ||