blob: 7b497b83cab8ebb8f1356294e2093896be138aaa [file] [log] [blame]
Patrick Williams2390b1b2022-11-03 13:47:49 -05001From 2918d431cb5607933755fc80a6220135dd7fcb1d Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 14 May 2013 15:00:26 -0700
Andrew Geisslereff27472021-10-29 15:35:00 -05004Subject: [PATCH] python3: Add target and native recipes
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05005
Patrick Williamsc124f4f2015-09-15 14:41:29 -05006Upstream-Status: Inappropriate [embedded specific]
7
802/2015 Rebased for Python 3.4.2
9
Andrew Geissler6ce62a22020-11-30 19:58:47 -060010The proper prefix is inside our staging area.
11Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
12Signed-off-by: Phil Blundell <philb@gnu.org>
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Andrew Geissler595f6302022-01-24 19:11:47 +000015
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050016---
Brad Bishopa34c0302019-09-23 22:34:48 -040017 Lib/distutils/sysconfig.py | 14 +++++++++++---
18 1 file changed, 11 insertions(+), 3 deletions(-)
Patrick Williamsc0f7c042017-02-23 20:41:17 -060019
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050020diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
Patrick Williams2390b1b2022-11-03 13:47:49 -050021index 03b8558..57d193d 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022--- a/Lib/distutils/sysconfig.py
23+++ b/Lib/distutils/sysconfig.py
Patrick Williams2390b1b2022-11-03 13:47:49 -050024@@ -272,7 +272,9 @@ def get_python_inc(plat_specific=0, prefix=None):
Patrick Williamsc124f4f2015-09-15 14:41:29 -050025 If 'prefix' is supplied, use it instead of sys.base_prefix or
26 sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
27 """
28- if prefix is None:
Brad Bishopa34c0302019-09-23 22:34:48 -040029+ if prefix is None and os.environ.get('STAGING_INCDIR', ""):
Patrick Williamsc124f4f2015-09-15 14:41:29 -050030+ prefix = os.environ['STAGING_INCDIR'].rstrip('include')
31+ elif prefix is None:
32 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
33 if os.name == "posix":
34 if python_build:
Patrick Williams2390b1b2022-11-03 13:47:49 -050035@@ -315,7 +317,13 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
Patrick Williamsc124f4f2015-09-15 14:41:29 -050036 If 'prefix' is supplied, use it instead of sys.base_prefix or
37 sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
38 """
Brad Bishopa34c0302019-09-23 22:34:48 -040039- if prefix is None:
40+ if os.environ.get('STAGING_LIBDIR', ""):
41+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
42+ else:
43+ lib_basename = "lib"
44+ if prefix is None and os.environ.get('STAGING_LIBDIR', ""):
Patrick Williamsc124f4f2015-09-15 14:41:29 -050045+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
Brad Bishopa34c0302019-09-23 22:34:48 -040046+ elif prefix is None:
Patrick Williamsc124f4f2015-09-15 14:41:29 -050047 if standard_lib:
48 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
Brad Bishopa34c0302019-09-23 22:34:48 -040049 else:
Patrick Williams2390b1b2022-11-03 13:47:49 -050050@@ -329,7 +337,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
Andrew Geissler6ce62a22020-11-30 19:58:47 -060051 else:
52 # Pure Python
53 libdir = "lib"
54- libpython = os.path.join(prefix, libdir,
55+ libpython = os.path.join(prefix, lib_basename,
56 "python" + get_python_version())
Patrick Williamsc124f4f2015-09-15 14:41:29 -050057 if standard_lib:
58 return libpython