summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-02-16 20:16:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-18 23:53:54 +0000
commit39970f583dddf04139a039cbe04e62b7236f0481 (patch)
tree364435f15b7abd90e2452b17d1a81019f4a04855 /meta
parent216c570979d3eef1d5d345a63b7b909829bd2bb0 (diff)
downloadpoky-39970f583dddf04139a039cbe04e62b7236f0481.tar.gz
python3: resolve ncurses host contamination
(From OE-Core rev: ee7be51444b609a5cc1fd223b9395e9642d3bfac) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch2
-rw-r--r--meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch48
-rw-r--r--meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch2
-rw-r--r--meta/recipes-devtools/python/python3_3.8.1.bb1
4 files changed, 51 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
index 03f60088fe..e7af3c6f5c 100644
--- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
@@ -1,4 +1,4 @@
1From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001 1From 7ada9c749f6beb51c13a3debc850755e911548a6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 31 Jan 2019 16:46:30 +0100 3Date: Thu, 31 Jan 2019 16:46:30 +0100
4Subject: [PATCH] distutils/sysconfig: append 4Subject: [PATCH] distutils/sysconfig: append
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
new file mode 100644
index 0000000000..e04a91605c
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch
@@ -0,0 +1,48 @@
1From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 16 Feb 2020 17:50:25 +0100
4Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from
5 the host
6
7This leads to host contamination, and particularly can cause
8curses modules to fail at runtime if the host curses is configured
9differently to native curses (observed on current OpenSuse Tumbleweed
10as dnf failures).
11
12Upstream-Status: Inappropriate [oe-core specific]
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14---
15 configure.ac | 6 ------
16 setup.py | 2 --
17 2 files changed, 8 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index 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
36diff --git a/setup.py b/setup.py
37index 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'
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index 6fe9839f77..61ac3e71dc 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
1From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001 1From 251347fc970a397a9cd63ed3f87c5e6c52e15187 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 14 May 2013 15:00:26 -0700 3Date: Tue, 14 May 2013 15:00:26 -0700
4Subject: [PATCH] python3: Add target and native recipes 4Subject: [PATCH] python3: Add target and native recipes
diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb
index c836066215..77968528c7 100644
--- a/meta/recipes-devtools/python/python3_3.8.1.bb
+++ b/meta/recipes-devtools/python/python3_3.8.1.bb
@@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
31 file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ 31 file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
32 file://0001-configure.ac-fix-LIBPL.patch \ 32 file://0001-configure.ac-fix-LIBPL.patch \
33 file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ 33 file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \
34 file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
34 " 35 "
35 36
36SRC_URI_append_class-native = " \ 37SRC_URI_append_class-native = " \