58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From 7630ab22578746d3d790d0598c0d279cf7afed97 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Tue, 14 May 2013 15:00:26 -0700
|
|
Subject: [PATCH 01/20] python3: Add target and native recipes
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
02/2015 Rebased for Python 3.4.2
|
|
|
|
# The proper prefix is inside our staging area.
|
|
# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
|
|
# Signed-off-by: Phil Blundell <philb@gnu.org>
|
|
# Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
# Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
|
|
|
|
---
|
|
Lib/distutils/sysconfig.py | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
|
|
index 573724d..390c485 100644
|
|
--- a/Lib/distutils/sysconfig.py
|
|
+++ b/Lib/distutils/sysconfig.py
|
|
@@ -84,7 +84,9 @@ def get_python_inc(plat_specific=0, prefix=None):
|
|
If 'prefix' is supplied, use it instead of sys.base_prefix or
|
|
sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
|
|
"""
|
|
- if prefix is None:
|
|
+ if prefix is None and os.environ['STAGING_INCDIR'] != "":
|
|
+ prefix = os.environ['STAGING_INCDIR'].rstrip('include')
|
|
+ elif prefix is None:
|
|
prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
|
|
if os.name == "posix":
|
|
if python_build:
|
|
@@ -125,6 +127,10 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
|
If 'prefix' is supplied, use it instead of sys.base_prefix or
|
|
sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
|
|
"""
|
|
+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
|
|
+ if prefix is None and os.environ['STAGING_LIBDIR'] != "":
|
|
+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
|
|
+
|
|
if prefix is None:
|
|
if standard_lib:
|
|
prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
|
|
@@ -133,7 +139,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
|
|
|
if os.name == "posix":
|
|
libpython = os.path.join(prefix,
|
|
- "lib", "python" + get_python_version())
|
|
+ lib_basename, "python" + get_python_version())
|
|
if standard_lib:
|
|
return libpython
|
|
else:
|
|
--
|
|
2.8.0.rc3
|
|
|