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 e04a91605c..0661249bfd 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 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 | 1 | From d0205c60d08f51d84bd8ddc07a57e8c71710fdad 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 |
@@ -13,16 +12,15 @@ Upstream-Status: Inappropriate [oe-core specific] | |||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
14 | --- | 13 | --- |
15 | configure.ac | 6 ------ | 14 | configure.ac | 6 ------ |
16 | setup.py | 2 -- | 15 | 1 file changed, 6 deletions(-) |
17 | 2 files changed, 8 deletions(-) | ||
18 | 16 | ||
19 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
20 | index 915f475..c911011 100644 | 18 | index c49cd4f..affdedf 100644 |
21 | --- a/configure.ac | 19 | --- a/configure.ac |
22 | +++ b/configure.ac | 20 | +++ b/configure.ac |
23 | @@ -4828,12 +4828,6 @@ then | 21 | @@ -6508,12 +6508,6 @@ AS_VAR_IF([have_panel], [no], [ |
24 | [Define if you have struct stat.st_mtimensec]) | 22 | AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) |
25 | fi | 23 | ]) |
26 | 24 | ||
27 | -# first curses header check | 25 | -# first curses header check |
28 | -ac_save_cppflags="$CPPFLAGS" | 26 | -ac_save_cppflags="$CPPFLAGS" |
@@ -30,19 +28,6 @@ index 915f475..c911011 100644 | |||
30 | - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" | 28 | - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" |
31 | -fi | 29 | -fi |
32 | - | 30 | - |
33 | AC_CHECK_HEADERS(curses.h ncurses.h) | ||
34 | |||
35 | # On Solaris, term.h requires curses.h | 31 | # On Solaris, term.h requires curses.h |
36 | diff --git a/setup.py b/setup.py | 32 | AC_CHECK_HEADERS([term.h], [], [], [ |
37 | index b0f1541..7208cd0 100644 | 33 | #ifdef HAVE_CURSES_H |
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' | ||