diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-11 11:40:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 11:57:38 +0100 |
commit | fae4ba632bc739cdf7369659f9b3bea2dd1cde45 (patch) | |
tree | 33742ebcb9c64ca8c868aee818ba1e887d4b3a1e /meta/recipes-devtools/python/python3/makerace.patch | |
parent | 11df8c79a70621591b88f769157db278121cd657 (diff) | |
download | poky-fae4ba632bc739cdf7369659f9b3bea2dd1cde45.tar.gz |
python3: update 3.9.7 -> 3.10.0
native and target 0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
replaced by native-only 0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
which is more reboust against upstream changes, and keeps target code unmodified.
This however necessitated adding 0001-sysconfig.py-use-platlibdir-also-for-purelib.patch
to avoid hardcoding 'lib' on target builds as libdir.
Drop chunk from 0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch as
upstream now uses sysconfig directly inside distutils.
Add 0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch and
0001-multiprocessing-disable-a-failing-test.patch to address ptest failures.
License-Update: copyright years, case corrections.
(From OE-Core rev: 72a75043a946f7db01d3ec04c8889e055f542cca)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/makerace.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/makerace.patch | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index 96744cb557..b150c1cb38 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 8b8583fb4f2bb3421e31ef06d17c04deec431c7e Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Tue, 13 Jul 2021 23:19:29 +0100 | ||
4 | Subject: [PATCH] python3: Fix make race | ||
5 | |||
1 | libainstall installs python-config.py but the .pyc cache files are generated | 6 | libainstall installs python-config.py but the .pyc cache files are generated |
2 | by the libinstall target. This means some builds may not generate the pyc files | 7 | by the libinstall target. This means some builds may not generate the pyc files |
3 | for python-config.py depending on the order things happen in. This means builds | 8 | for python-config.py depending on the order things happen in. This means builds |
@@ -8,14 +13,18 @@ Add a dependency to avoid the race. | |||
8 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
10 | 15 | ||
11 | Index: Python-3.9.6/Makefile.pre.in | 16 | --- |
12 | =================================================================== | 17 | Makefile.pre.in | 2 +- |
13 | --- Python-3.9.6.orig/Makefile.pre.in | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | +++ Python-3.9.6/Makefile.pre.in | 19 | |
15 | @@ -1486,7 +1486,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter | 20 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
16 | venv venv/scripts venv/scripts/common venv/scripts/posix \ | 21 | index 69d47a2..c471b60 100644 |
17 | curses pydoc_data \ | 22 | --- a/Makefile.pre.in |
18 | zoneinfo | 23 | +++ b/Makefile.pre.in |
24 | @@ -1528,7 +1528,7 @@ TESTSUBDIRS= ctypes/test \ | ||
25 | unittest/test unittest/test/testmock | ||
26 | |||
27 | TEST_MODULES=@TEST_MODULES@ | ||
19 | -libinstall: build_all $(srcdir)/Modules/xxmodule.c | 28 | -libinstall: build_all $(srcdir)/Modules/xxmodule.c |
20 | +libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall | 29 | +libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall |
21 | @for i in $(SCRIPTDIR) $(LIBDEST); \ | 30 | @for i in $(SCRIPTDIR) $(LIBDEST); \ |