diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-20 18:24:47 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-21 12:52:52 +0000 |
commit | 28c5a5033e4893ec1f1fd5aab8b2fd0d5f815678 (patch) | |
tree | 516cabd91f2d95e50eb1980efa4cda946fdb8b57 /meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch | |
parent | f7a99d04e6fb81ffbb14cfa3caaf47e89bb424b5 (diff) | |
download | poky-28c5a5033e4893ec1f1fd5aab8b2fd0d5f815678.tar.gz |
python3: update to 3.8.1
Drop backports, rebase other patches.
0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
is removed as the use case (allowing python 2 and 3 to coexist
in SDKs) is no longer relevant with Python 2.x reaching end of line
and upstream has refactored the code making a rebase difficult.
If needed, please re-add the patch to py2, rather than py3.
Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes
and classes accordingly.
The manifest for the 3.8.0 version is updated; particularly pkgutil
module is now packaged in -core (as other things in core need it);
this also necessitates allowing empty -pkgutil package to avoid
breakage across layers.
(From OE-Core rev: e6ab9f16b92aa1abdae82c535c1a452a1341b0e2)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch b/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch deleted file mode 100644 index a146c747f8..0000000000 --- a/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 5ce3ac59531828ff682646fbba59b2126b28a8aa Mon Sep 17 00:00:00 2001 | ||
2 | From: Jaewon Lee <jaewon.lee@xilinx.com> | ||
3 | Date: Thu, 25 Apr 2019 15:34:26 -0700 | ||
4 | Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead of PYTHONHOME | ||
5 | |||
6 | There is one variable PYTHONHOME to determine where libraries are coming | ||
7 | from for both python2 and python3. This becomes an issue if only one has | ||
8 | libraries in the specified PYTHONHOME path, but they are using the same | ||
9 | PYTHONHOME. Creating another variable OEPYTHON3HOME to allow for a way | ||
10 | to set a different path for python3 | ||
11 | |||
12 | Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> | ||
13 | |||
14 | Upstream-Status: Inappropriate [OE specific configuration] | ||
15 | |||
16 | --- | ||
17 | Modules/main.c | 17 +++++++++++++---- | ||
18 | 1 file changed, 13 insertions(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/Modules/main.c b/Modules/main.c | ||
21 | index acc59c6..407085a 100644 | ||
22 | --- a/Modules/main.c | ||
23 | +++ b/Modules/main.c | ||
24 | @@ -1834,10 +1834,19 @@ config_init_home(_PyCoreConfig *config) | ||
25 | } | ||
26 | return _Py_INIT_OK(); | ||
27 | } | ||
28 | - | ||
29 | - int res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME"); | ||
30 | - if (res < 0) { | ||
31 | - return DECODE_LOCALE_ERR("PYTHONHOME", res); | ||
32 | + int res; | ||
33 | + const char *oepython3home = config_get_env_var("OEPYTHON3HOME"); | ||
34 | + if (oepython3home) { | ||
35 | + res = config_get_env_var_dup(&home, L"OEPYTHON3HOME", "OEPYTHON3HOME"); | ||
36 | + if (res < 0) { | ||
37 | + return DECODE_LOCALE_ERR("OEPYTHON3HOME", res); | ||
38 | + } | ||
39 | + } | ||
40 | + else { | ||
41 | + res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME"); | ||
42 | + if (res < 0) { | ||
43 | + return DECODE_LOCALE_ERR("PYTHONHOME", res); | ||
44 | + } | ||
45 | } | ||
46 | config->home = home; | ||
47 | return _Py_INIT_OK(); | ||