| Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 1 | configure.ac: add CROSSPYTHONPATH into PYTHONPATH for PYTHON_FOR_BUILD |
| 2 | |
| 3 | When building x86->x86 the system will try to execute .so and related items |
| 4 | from the default PYTHONPATH. This will fail if the target CPU contains |
| 5 | instructions that the host CPU does not have, add CROSSPYTHONPATH |
| 6 | into PYTHONPATH so we can prepend the list to find correct libs. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE-Core integration specific] |
| 9 | |
| 10 | Credits-to: Mark Hatle <mark.hatle@windriver.com> |
| 11 | Credits-to: Jackie Huang <jackie.huang@windriver.com> |
| 12 | Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> |
| 13 | diff --git a/configure.ac b/configure.ac |
| 14 | index 4ab19a6..7036a53 100644 |
| 15 | --- a/configure.ac |
| 16 | +++ b/configure.ac |
| 17 | @@ -76,7 +76,7 @@ if test "$cross_compiling" = yes; then |
| 18 | AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) |
| 19 | fi |
| 20 | AC_MSG_RESULT($interp) |
| 21 | - 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) '$interp |
| 22 | + 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) '$interp |
| 23 | fi |
| 24 | elif test "$cross_compiling" = maybe; then |
| 25 | AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) |