blob: 2c4aef05111ceb4760814b4133868b9ab8873ca6 [file] [log] [blame]
Patrick Williams56b44a92024-01-19 08:49:29 -06001From 5b66463c10fec1440e977d5a21a0167862d6d79c Mon Sep 17 00:00:00 2001
Andrew Geissler595f6302022-01-24 19:11:47 +00002From: Ricardo Ribalda <ricardo@ribalda.com>
3Date: Tue, 18 Nov 2014 03:35:33 -0500
4Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for
5 PYTHON_FOR_BUILD
Brad Bishopf3fd2882019-06-21 08:06:37 -04006
7When building x86->x86 the system will try to execute .so and related items
8from the default PYTHONPATH. This will fail if the target CPU contains
9instructions that the host CPU does not have, add CROSSPYTHONPATH
10into PYTHONPATH so we can prepend the list to find correct libs.
11
12Upstream-Status: Inappropriate [OE-Core integration specific]
13
14Credits-to: Mark Hatle <mark.hatle@windriver.com>
15Credits-to: Jackie Huang <jackie.huang@windriver.com>
16Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
Andrew Geissler595f6302022-01-24 19:11:47 +000017
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
Brad Bishopf3fd2882019-06-21 08:06:37 -040022diff --git a/configure.ac b/configure.ac
Patrick Williams56b44a92024-01-19 08:49:29 -060023index cb9e198..d81c19a 100644
Brad Bishopf3fd2882019-06-21 08:06:37 -040024--- a/configure.ac
25+++ b/configure.ac
Patrick Williams56b44a92024-01-19 08:49:29 -060026@@ -165,7 +165,7 @@ AC_ARG_WITH([build-python],
Patrick Williams2390b1b2022-11-03 13:47:49 -050027 dnl Build Python interpreter is used for regeneration and freezing.
28 ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
29 PYTHON_FOR_FREEZE="$with_build_python"
30- 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
31+ 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
32 AC_MSG_RESULT([$with_build_python])
33 ], [
34 AS_VAR_IF([cross_compiling], [yes],