1*4882a593SmuzhiyunFrom 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3*4882a593SmuzhiyunDate: Wed, 23 Dec 2015 11:33:14 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Adjust library/header paths for cross-compilation 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWhen cross-compiling third-party extensions, the get_python_inc() or 7*4882a593Smuzhiyunget_python_lib() can be called, to return the path to headers or 8*4882a593Smuzhiyunlibraries. However, they use the sys.prefix of the host Python, which 9*4882a593Smuzhiyunreturns incorrect paths when cross-compiling (paths pointing to host 10*4882a593Smuzhiyunheaders and libraries). 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunIn order to fix this, we introduce the _python_sysroot, _python_prefix 13*4882a593Smuzhiyunand _python_exec_prefix variables, that allow to override these 14*4882a593Smuzhiyunvalues, and get correct header/library paths when cross-compiling 15*4882a593Smuzhiyunthird-party Python modules. 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 18*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 19*4882a593SmuzhiyunRefresh for 3.10.0 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun Lib/distutils/command/build_ext.py | 5 ++++- 22*4882a593Smuzhiyun Lib/sysconfig.py | 15 +++++++++++---- 23*4882a593Smuzhiyun 2 files changed, 15 insertions(+), 5 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py 26*4882a593Smuzhiyunindex 1a9bd12..3cf7d67 100644 27*4882a593Smuzhiyun--- a/Lib/distutils/command/build_ext.py 28*4882a593Smuzhiyun+++ b/Lib/distutils/command/build_ext.py 29*4882a593Smuzhiyun@@ -234,7 +234,10 @@ class build_ext(Command): 30*4882a593Smuzhiyun if (sysconfig.get_config_var('Py_ENABLE_SHARED')): 31*4882a593Smuzhiyun if not sysconfig.python_build: 32*4882a593Smuzhiyun # building third party extensions 33*4882a593Smuzhiyun- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) 34*4882a593Smuzhiyun+ libdir = sysconfig.get_config_var('LIBDIR') 35*4882a593Smuzhiyun+ if "_python_sysroot" in os.environ: 36*4882a593Smuzhiyun+ libdir = os.environ.get("_python_sysroot") + libdir 37*4882a593Smuzhiyun+ self.library_dirs.append(libdir) 38*4882a593Smuzhiyun else: 39*4882a593Smuzhiyun # building python standard extensions 40*4882a593Smuzhiyun self.library_dirs.append('.') 41*4882a593Smuzhiyundiff --git a/Lib/sysconfig.py b/Lib/sysconfig.py 42*4882a593Smuzhiyunindex 95b48f6..9fb1956 100644 43*4882a593Smuzhiyun--- a/Lib/sysconfig.py 44*4882a593Smuzhiyun+++ b/Lib/sysconfig.py 45*4882a593Smuzhiyun@@ -123,10 +123,17 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', 46*4882a593Smuzhiyun _PY_VERSION = sys.version.split()[0] 47*4882a593Smuzhiyun _PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}' 48*4882a593Smuzhiyun _PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}' 49*4882a593Smuzhiyun-_PREFIX = os.path.normpath(sys.prefix) 50*4882a593Smuzhiyun-_BASE_PREFIX = os.path.normpath(sys.base_prefix) 51*4882a593Smuzhiyun-_EXEC_PREFIX = os.path.normpath(sys.exec_prefix) 52*4882a593Smuzhiyun-_BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) 53*4882a593Smuzhiyun+if "_python_sysroot" in os.environ: 54*4882a593Smuzhiyun+ _sysroot=os.environ.get('_python_sysroot') 55*4882a593Smuzhiyun+ _PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix')) 56*4882a593Smuzhiyun+ _EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix')) 57*4882a593Smuzhiyun+ _BASE_PREFIX = _PREFIX 58*4882a593Smuzhiyun+ _BASE_EXEC_PREFIX = _EXEC_PREFIX 59*4882a593Smuzhiyun+else: 60*4882a593Smuzhiyun+ _PREFIX = os.path.normpath(sys.prefix) 61*4882a593Smuzhiyun+ _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) 62*4882a593Smuzhiyun+ _BASE_PREFIX = os.path.normpath(sys.base_prefix) 63*4882a593Smuzhiyun+ _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) 64*4882a593Smuzhiyun _CONFIG_VARS = None 65*4882a593Smuzhiyun _USER_BASE = None 66*4882a593Smuzhiyun 67*4882a593Smuzhiyun-- 68*4882a593Smuzhiyun2.30.2 69*4882a593Smuzhiyun 70