git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From ffe7797637f08cd6ee4c82e2d67462c5e194d30a 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  Modules/main.c | 17 +++++++++++++----
  15  1 file changed, 13 insertions(+), 4 deletions(-)
  16
  17 diff --git a/Modules/main.c b/Modules/main.c
  18 index a745381..b553e30 100644
  19 --- a/Modules/main.c
  20 +++ b/Modules/main.c
  21 @@ -1855,10 +1855,19 @@ config_init_home(_PyCoreConfig *config)
  22          }
  23          return _Py_INIT_OK();
  24      }
  25 -
  26 -    int res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME");
  27 -    if (res < 0) {
  28 -        return DECODE_LOCALE_ERR("PYTHONHOME", res);
  29 +    int res;
  30 +    const char *oepython3home = config_get_env_var("OEPYTHON3HOME");
  31 +    if (oepython3home) {
  32 +        res = config_get_env_var_dup(&home, L"OEPYTHON3HOME", "OEPYTHON3HOME");
  33 +        if (res < 0) {
  34 +            return DECODE_LOCALE_ERR("OEPYTHON3HOME", res);
  35 +        }
  36 +    }
  37 +    else {
  38 +        res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME");
  39 +        if (res < 0) {
  40 +            return DECODE_LOCALE_ERR("PYTHONHOME", res);
  41 +        }
  42      }
  43      config->home = home;
  44      return _Py_INIT_OK();
  45 --
  46 2.7.4
  47