diff options
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(); | ||