From: Jeffery To Date: Mon, 30 Oct 2023 15:56:43 +0000 (+0800) Subject: python3: Fix building C extensions with setuptools X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f218d96e14eafc6bd323d871a56a94b4b5e8c68b;p=feed%2Fpackages.git python3: Fix building C extensions with setuptools setuptools provides a local copy of distutils and when building a C extension, this distutils will add the target LIBDIR (/usr/lib) to the list of library paths. If the build system has a libpython3.11.so in /usr/lib, then the linker will try to link to this shared library and fail. This adapts 008-distutils-use-python-sysroot.patch for host setuptools to add the correct library directory. Fixes: https://github.com/openwrt/packages/issues/22330 Signed-off-by: Jeffery To (cherry picked from commit 624fb955619c0b4b368e2ac1880619f159e3b8d6) --- diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index 5712e0f1d3..6b21bc61e7 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -12,7 +12,7 @@ PYTHON3_VERSION_MICRO:=6 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) -PYTHON3_SETUPTOOLS_PKG_RELEASE:=1 +PYTHON3_SETUPTOOLS_PKG_RELEASE:=2 PYTHON3_PIP_PKG_RELEASE:=1 PYTHON3_SETUPTOOLS_VERSION:=65.5.0 diff --git a/lang/python/python3/patches-host-setuptools/0001-Adjust-library-header-paths-for-cross-compilation.patch b/lang/python/python3/patches-host-setuptools/0001-Adjust-library-header-paths-for-cross-compilation.patch new file mode 100644 index 0000000000..06dbb4318c --- /dev/null +++ b/lang/python/python3/patches-host-setuptools/0001-Adjust-library-header-paths-for-cross-compilation.patch @@ -0,0 +1,38 @@ +From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +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 +[adapt for setuptools, rename environment variable, use fixed lib path] +Signed-off-by: Jeffery To +--- + Lib/distutils/command/build_ext.py | 5 ++++- + Lib/sysconfig.py | 15 +++++++++++---- + 2 files changed, 15 insertions(+), 5 deletions(-) + +--- a/setuptools/_distutils/command/build_ext.py ++++ b/setuptools/_distutils/command/build_ext.py +@@ -238,7 +238,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 'STAGING_DIR' in os.environ: ++ libdir = os.environ.get('STAGING_DIR') + '/usr/lib' ++ self.library_dirs.append(libdir) + else: + # building python standard extensions + self.library_dirs.append('.')