mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
b06633b6ae
The semaphore fix has landed and is available from 3.11 onwards:
1ee0f94d16
Drop 0001-Mitigate-the-race-condition-in-testSockName.patch
as it is merged upstream.
(From OE-Core rev: f10cdc155e47af5627ee999c57e1d083f9382a91)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
From 7d5fc6a86103d9bd4a274e9fd31b6987e39998a1 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 085fc0b..22790d7 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -163,7 +163,7 @@ AC_ARG_WITH(
|
|
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],
|