blob: 0bafec73c0c361151569612d894d64570182a6e9 [file] [log] [blame]
Brad Bishopa34c0302019-09-23 22:34:48 -04001From 6229502e5ae6cbb22240594f002638e9ef78f831 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
Brad Bishop19323692019-04-05 15:28:33 -04004Subject: [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
10# The proper prefix is inside our staging area.
11# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
12# Signed-off-by: Phil Blundell <philb@gnu.org>
13# Signed-off-by: Khem Raj <raj.khem@gmail.com>
14# Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
15
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
Brad Bishopa34c0302019-09-23 22:34:48 -040021index 3dfd0a3..6c6b09a 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022--- a/Lib/distutils/sysconfig.py
23+++ b/Lib/distutils/sysconfig.py
Brad Bishopa34c0302019-09-23 22:34:48 -040024@@ -97,7 +97,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:
Brad Bishopa34c0302019-09-23 22:34:48 -040035@@ -140,7 +142,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:
50@@ -148,7 +156,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
Patrick Williamsc124f4f2015-09-15 14:41:29 -050051
52 if os.name == "posix":
53 libpython = os.path.join(prefix,
54- "lib", "python" + get_python_version())
55+ lib_basename, "python" + get_python_version())
56 if standard_lib:
57 return libpython
58 else: