mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-14 04:33:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding back wrapper and using OEPYTHON3HOME variable for python3

Browse Source 
Adding back the python wrapper and adding a patch to use OEPYTHON3HOME
instead of PYTHONHOME if set, for python3.

If we add back the wrapper as is, we would see the following error that
we also see in Thud:

ImportError: No module named site
OpenEmbedded requires 'python' to be python v2 (>= 2.7.3), not python
v3.
Please upgrade your python v2

This is because python3 would've set PYTHONHOME to use nativesdk
python3 libraries but when the oe-buildenv-internal script tries to call
python2 for the py_v27_check, there will be no python2 libraries in the
PYTHONHOME directory.
In other words, bitbake needs host python2 and the env variable set from
the wrapper contaminates the env and host python2 won't be able to find
its libraries

Creating another variable OEPYTHON3HOME and using this in the python3
wrapper to allow for a way to set a different paths for python3 and
python2

[YOCTO #13208]

(From OE-Core rev: 75d2a85e24ef9a2bf0e218521944523f0ff281e0)

(From OE-Core rev: b29e87376fdd49ce07749b87c3000033fa96e43f)

Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jaewon Lee
2019-04-25 16:02:21 -07:00
committed by Richard Purdie
parent 904e05f467
commit e7e1b9a43d
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch Normal file
View File

@@ -0,0 +1,35 @@
From ffe7797637f08cd6ee4c82e2d67462c5e194d30a Mon Sep 17 00:00:00 2001
From: Jaewon Lee <jaewon.lee@xilinx.com>
Date: Thu, 25 Apr 2019 15:34:26 -0700
Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead of PYTHONHOME
There is one variable PYTHONHOME to determine where libraries are coming
from for both python2 and python3. This becomes an issue if only one has
libraries in the specified PYTHONHOME path, but they are using the same
PYTHONHOME. Creating another variable OEPYTHON3HOME to allow for a way
to set a different path for python3
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
RP: Backported to 3.5.6 (code totally different to original path for
later python versions)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Modules/main.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
Index: Python-3.5.6/Python/pylifecycle.c
===================================================================
--- Python-3.5.6.orig/Python/pylifecycle.c
+++ Python-3.5.6/Python/pylifecycle.c
@@ -864,7 +864,9 @@ Py_GetPythonHome(void)
{
wchar_t *home = default_home;
if (home == NULL && !Py_IgnoreEnvironmentFlag) {
- char* chome = Py_GETENV("PYTHONHOME");
+ char* chome = Py_GETENV("OEPYTHON3HOME");
+ if (!chome)
+ chome = Py_GETENV("PYTHONHOME");
if (chome) {
size_t size = Py_ARRAY_LENGTH(env_home);
size_t r = mbstowcs(env_home, chome, size);