mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
78e30d940d
Drop distutils and smtpd modules from packaging, as both are gone in 3.12. Rebase: 0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch (drop setup.py chunk as the file is gone) Drop patches: 0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch (setup.py gone, lib/termcap not mentioned anywhere else) 0001-Don-t-search-system-for-headers-libraries.patch (setup.py gone, usr/lib64 not mentioned anywhere else) 0001-Makefile-do-not-compile-.pyc-in-parallel.patch (replaced with COMPILEALL_OPTS= in EXTRA_OEMAKE) 0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch (setup.py gone, add_multiarch_paths not mentioned anywhere else) 0017-setup.py-do-not-report-missing-dependencies-for-disa.patch (has been superseded by Setup.local tweak in do_configure:prepend) 12-distutils-prefix-is-inside-staging-area.patch (distutils has been removed upstream, so this old, unplesant hack can be finally dropped) avoid_warning_about_tkinter.patch (setup.py gone, tkinter detection logic performed in configure.ac) (From OE-Core rev: 716d82352545d3667a658b69d65d6127678dd150) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
From 5b66463c10fec1440e977d5a21a0167862d6d79c Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Ribalda <ricardo@ribalda.com>
|
|
Date: Tue, 18 Nov 2014 03:35:33 -0500
|
|
Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for
|
|
PYTHON_FOR_BUILD
|
|
|
|
When building x86->x86 the system will try to execute .so and related items
|
|
from the default PYTHONPATH. This will fail if the target CPU contains
|
|
instructions that the host CPU does not have, add CROSSPYTHONPATH
|
|
into PYTHONPATH so we can prepend the list to find correct libs.
|
|
|
|
Upstream-Status: Inappropriate [OE-Core integration specific]
|
|
|
|
Credits-to: Mark Hatle <mark.hatle@windriver.com>
|
|
Credits-to: Jackie Huang <jackie.huang@windriver.com>
|
|
Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
|
|
|
|
---
|
|
configure.ac | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index cb9e198..d81c19a 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -165,7 +165,7 @@ AC_ARG_WITH([build-python],
|
|
dnl Build Python interpreter is used for regeneration and freezing.
|
|
ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
|
|
PYTHON_FOR_FREEZE="$with_build_python"
|
|
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
|
|
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
|
|
AC_MSG_RESULT([$with_build_python])
|
|
], [
|
|
AS_VAR_IF([cross_compiling], [yes],
|