| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From fc93b3cc23b4f9698ae92a42986dbb02b6f19588 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Sun, 18 Jan 2015 06:29:50 -0800 |
| 4 | Subject: [PATCH] sysconfig.py: add _PYTHON_PROJECT_SRC |
| 5 | |
| 6 | python3 has introduced _PYTHON_PROJECT_BASE which is used for separate B |
| 7 | and S, but it doesn't work when compile Modules, the target python3 runs |
| 8 | python3-native's sysconfig to get srcdir which is the native's, there |
| 9 | would be errors when native's srcdir has been removed, add |
| 10 | _PYTHON_PROJECT_SRC to fix the problem. |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 15 | --- |
| 16 | Lib/distutils/sysconfig.py | 5 ++++- |
| 17 | Lib/sysconfig.py | 5 ++++- |
| 18 | 2 files changed, 8 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
| 21 | index a545ab9..74317d1 100644 |
| 22 | --- a/Lib/distutils/sysconfig.py |
| 23 | +++ b/Lib/distutils/sysconfig.py |
| 24 | @@ -554,7 +554,10 @@ def get_config_vars(*args): |
| 25 | _config_vars['exec_prefix'] = EXEC_PREFIX |
| 26 | |
| 27 | # Always convert srcdir to an absolute path |
| 28 | - srcdir = _config_vars.get('srcdir', project_base) |
| 29 | + if "_PYTHON_PROJECT_SRC" in os.environ: |
| 30 | + srcdir = os.path.abspath(os.environ["_PYTHON_PROJECT_SRC"]) |
| 31 | + else: |
| 32 | + srcdir = _config_vars.get('srcdir', project_base) |
| 33 | if os.name == 'posix': |
| 34 | if python_build: |
| 35 | # If srcdir is a relative path (typically '.' or '..') |
| 36 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py |
| 37 | index 7287f11..cc92998 100644 |
| 38 | --- a/Lib/sysconfig.py |
| 39 | +++ b/Lib/sysconfig.py |
| 40 | @@ -562,7 +562,10 @@ def get_config_vars(*args): |
| 41 | _CONFIG_VARS['userbase'] = _getuserbase() |
| 42 | |
| 43 | # Always convert srcdir to an absolute path |
| 44 | - srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) |
| 45 | + if "_PYTHON_PROJECT_SRC" in os.environ: |
| 46 | + srcdir = os.path.abspath(os.environ["_PYTHON_PROJECT_SRC"]) |
| 47 | + else: |
| 48 | + srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) |
| 49 | if os.name == 'posix': |
| 50 | if _PYTHON_BUILD: |
| 51 | # If srcdir is a relative path (typically '.' or '..') |
| 52 | -- |
| 53 | 1.7.9.5 |
| 54 | |