blob: c53ec0cfc85e3c75042131a2199e30c385285474 [file] [log] [blame]
Patrick Williamsc0f7c042017-02-23 20:41:17 -06001From 7630ab22578746d3d790d0598c0d279cf7afed97 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
4Subject: [PATCH 01/20] python3: Add target and native recipes
5
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---
Patrick Williamsc0f7c042017-02-23 20:41:17 -060017 Lib/distutils/sysconfig.py | 10 ++++++++--
18 1 file changed, 8 insertions(+), 2 deletions(-)
19
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050020diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
Patrick Williamsc0f7c042017-02-23 20:41:17 -060021index 573724d..390c485 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022--- a/Lib/distutils/sysconfig.py
23+++ b/Lib/distutils/sysconfig.py
Patrick Williamsc0f7c042017-02-23 20:41:17 -060024@@ -84,7 +84,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:
29+ if prefix is None and os.environ['STAGING_INCDIR'] != "":
30+ 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 Williamsc0f7c042017-02-23 20:41:17 -060035@@ -125,6 +127,10 @@ 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 """
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050039+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
Patrick Williamsc124f4f2015-09-15 14:41:29 -050040+ if prefix is None and os.environ['STAGING_LIBDIR'] != "":
Patrick Williamsc124f4f2015-09-15 14:41:29 -050041+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050042+
43 if prefix is None:
44 if standard_lib:
45 prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
Patrick Williamsc0f7c042017-02-23 20:41:17 -060046@@ -133,7 +139,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
Patrick Williamsc124f4f2015-09-15 14:41:29 -050047
48 if os.name == "posix":
49 libpython = os.path.join(prefix,
50- "lib", "python" + get_python_version())
51+ lib_basename, "python" + get_python_version())
52 if standard_lib:
53 return libpython
54 else:
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050055--
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600562.8.0.rc3
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050057