| From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 |
| From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| Date: Wed, 23 Dec 2015 11:33:14 +0100 |
| Subject: [PATCH] Adjust library/header paths for cross-compilation |
| |
| When cross-compiling third-party extensions, the get_python_inc() or |
| get_python_lib() can be called, to return the path to headers or |
| libraries. However, they use the sys.prefix of the host Python, which |
| returns incorrect paths when cross-compiling (paths pointing to host |
| headers and libraries). |
| |
| In order to fix this, we introduce the _python_sysroot, _python_prefix |
| and _python_exec_prefix variables, that allow to override these |
| values, and get correct header/library paths when cross-compiling |
| third-party Python modules. |
| |
| Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| --- |
| Lib/distutils/command/build_ext.py | 5 ++++- |
| Lib/distutils/sysconfig.py | 15 +++++++++++---- |
| 2 files changed, 15 insertions(+), 5 deletions(-) |
| |
| diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py |
| index 1a9bd1200f..3cf7d6746e 100644 |
| --- a/Lib/distutils/command/build_ext.py |
| +++ b/Lib/distutils/command/build_ext.py |
| @@ -234,7 +234,10 @@ class build_ext(Command): |
| if (sysconfig.get_config_var('Py_ENABLE_SHARED')): |
| if not sysconfig.python_build: |
| # building third party extensions |
| - self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) |
| + libdir = sysconfig.get_config_var('LIBDIR') |
| + if "_python_sysroot" in os.environ: |
| + libdir = os.environ.get("_python_sysroot") + libdir |
| + self.library_dirs.append(libdir) |
| else: |
| # building python standard extensions |
| self.library_dirs.append('.') |
| diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py |
| index 37feae5df7..e9c3a27856 100644 |
| --- a/Lib/distutils/sysconfig.py |
| +++ b/Lib/distutils/sysconfig.py |
| @@ -17,10 +17,17 @@ import sys |
| from .errors import DistutilsPlatformError |
| |
| # These are needed in a couple of spots, so just compute them once. |
| -PREFIX = os.path.normpath(sys.prefix) |
| -EXEC_PREFIX = os.path.normpath(sys.exec_prefix) |
| -BASE_PREFIX = os.path.normpath(sys.base_prefix) |
| -BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) |
| +if "_python_sysroot" in os.environ: |
| + _sysroot=os.environ.get('_python_sysroot') |
| + PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix')) |
| + EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix')) |
| + BASE_PREFIX = PREFIX |
| + BASE_EXEC_PREFIX = EXEC_PREFIX |
| +else: |
| + PREFIX = os.path.normpath(sys.prefix) |
| + EXEC_PREFIX = os.path.normpath(sys.exec_prefix) |
| + BASE_PREFIX = os.path.normpath(sys.base_prefix) |
| + BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) |
| |
| # Path to the base directory of the project. On Windows the binary may |
| # live in project/PCbuild/win32 or project/PCbuild/amd64. |
| -- |
| 2.25.1 |
| |