From 8d6b503b4a2eed90cab13c76f5a5a738c47f3a80 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 6 Mar 2015 11:11:18 +0200 Subject: [PATCH 1/3] python: re-number patches Signed-off-by: Alexandru Ardelean --- .../patches/{110-enable-zlib.patch => 001-enable-zlib.patch} | 0 ...tch => 002-do-not-add-include-dirs-when-cross-compiling.patch} | 0 ...sts-at-build.patch => 003-do-not-compile-tests-at-build.patch} | 0 ...write-bytes-codes.patch => 004-do-not-write-bytes-codes.patch} | 0 ...6-64-configure.patch => 005-fix-libffi-x86-64-configure.patch} | 0 ...ch-support.patch => 006-remove-debian-multiarch-support.patch} | 0 ...t-adjust-path.patch => 007-distutils-do-not-adjust-path.patch} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename lang/python/patches/{110-enable-zlib.patch => 001-enable-zlib.patch} (100%) rename lang/python/patches/{120-do-not-add-include-dirs-when-cross-compiling.patch => 002-do-not-add-include-dirs-when-cross-compiling.patch} (100%) rename lang/python/patches/{130-do-not-compile-tests-at-build.patch => 003-do-not-compile-tests-at-build.patch} (100%) rename lang/python/patches/{140-do-not-write-bytes-codes.patch => 004-do-not-write-bytes-codes.patch} (100%) rename lang/python/patches/{150-fix-libffi-x86-64-configure.patch => 005-fix-libffi-x86-64-configure.patch} (100%) rename lang/python/patches/{160-remove-debian-multiarch-support.patch => 006-remove-debian-multiarch-support.patch} (100%) rename lang/python/patches/{170-distutils-do-not-adjust-path.patch => 007-distutils-do-not-adjust-path.patch} (100%) diff --git a/lang/python/patches/110-enable-zlib.patch b/lang/python/patches/001-enable-zlib.patch similarity index 100% rename from lang/python/patches/110-enable-zlib.patch rename to lang/python/patches/001-enable-zlib.patch diff --git a/lang/python/patches/120-do-not-add-include-dirs-when-cross-compiling.patch b/lang/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch similarity index 100% rename from lang/python/patches/120-do-not-add-include-dirs-when-cross-compiling.patch rename to lang/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch diff --git a/lang/python/patches/130-do-not-compile-tests-at-build.patch b/lang/python/patches/003-do-not-compile-tests-at-build.patch similarity index 100% rename from lang/python/patches/130-do-not-compile-tests-at-build.patch rename to lang/python/patches/003-do-not-compile-tests-at-build.patch diff --git a/lang/python/patches/140-do-not-write-bytes-codes.patch b/lang/python/patches/004-do-not-write-bytes-codes.patch similarity index 100% rename from lang/python/patches/140-do-not-write-bytes-codes.patch rename to lang/python/patches/004-do-not-write-bytes-codes.patch diff --git a/lang/python/patches/150-fix-libffi-x86-64-configure.patch b/lang/python/patches/005-fix-libffi-x86-64-configure.patch similarity index 100% rename from lang/python/patches/150-fix-libffi-x86-64-configure.patch rename to lang/python/patches/005-fix-libffi-x86-64-configure.patch diff --git a/lang/python/patches/160-remove-debian-multiarch-support.patch b/lang/python/patches/006-remove-debian-multiarch-support.patch similarity index 100% rename from lang/python/patches/160-remove-debian-multiarch-support.patch rename to lang/python/patches/006-remove-debian-multiarch-support.patch diff --git a/lang/python/patches/170-distutils-do-not-adjust-path.patch b/lang/python/patches/007-distutils-do-not-adjust-path.patch similarity index 100% rename from lang/python/patches/170-distutils-do-not-adjust-path.patch rename to lang/python/patches/007-distutils-do-not-adjust-path.patch From 2727b3fda35c0ecec50c2e0bbd7373d824b6a5c7 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 6 Mar 2015 11:13:25 +0200 Subject: [PATCH 2/3] python: add patch for distutils to add support for the '_python_sysroot' env var Patch taken from buildroot: http://git.buildroot.net/buildroot/tree/package/python/python-008-distutils-use-python-sysroot.patch Signed-off-by: Alexandru Ardelean --- .../008-distutils-use-python-sysroot.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 lang/python/patches/008-distutils-use-python-sysroot.patch diff --git a/lang/python/patches/008-distutils-use-python-sysroot.patch b/lang/python/patches/008-distutils-use-python-sysroot.patch new file mode 100644 index 000000000..7cd748761 --- /dev/null +++ b/lang/python/patches/008-distutils-use-python-sysroot.patch @@ -0,0 +1,54 @@ +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. + +The _python_sysroot variable is also used to prefix the LIBDIR value +taken from the sysconfigdata module. + +Signed-off-by: Thomas Petazzoni + +Index: b/Lib/distutils/sysconfig.py +=================================================================== +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -19,8 +19,13 @@ + from distutils.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) ++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')) ++else: ++ PREFIX = os.path.normpath(sys.prefix) ++ EXEC_PREFIX = os.path.normpath(sys.exec_prefix) + + # Path to the base directory of the project. On Windows the binary may + # live in project/PCBuild9. If we're dealing with an x64 Windows build, +Index: b/Lib/distutils/command/build_ext.py +=================================================================== +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -237,7 +237,10 @@ + 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('.') From bb87de33dd85bf49f87606c58098013ae66e536b Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 6 Mar 2015 11:29:23 +0200 Subject: [PATCH 3/3] python: add '_python_*' env vars to host python Signed-off-by: Alexandru Ardelean --- lang/python/files/python-package.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index c8cbcda57..ed1f37e01 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -25,6 +25,9 @@ define HostPython ( export PYTHONPATH="$(PYTHONPATH)"; \ export PYTHONOPTIMIZE=""; \ export PYTHONDONTWRITEBYTECODE=1; \ + export _python_sysroot="$(STAGING_DIR)"; \ + export _python_prefix="/usr"; \ + export _python_exec_prefix="/usr"; \ $(1) \ $(HOST_PYTHON_BIN) $(2); \ )