84 lines
3.1 KiB
Diff
84 lines
3.1 KiB
Diff
|
We cross compile python. This patch uses tools from host/native
|
||
|
|
python instead of in-tree tools
|
||
|
|
|
||
|
|
-Khem
|
||
|
|
|
||
|
|
Upstream-Status: Inappropriate[Configuration Specific]
|
||
|
|
|
||
|
|
---
|
||
|
|
Makefile.pre.in | 25 +++++++++++++------------
|
||
|
|
1 file changed, 13 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
--- a/Makefile.pre.in
|
||
|
|
+++ b/Makefile.pre.in
|
||
|
|
@@ -193,6 +193,7 @@ LIBOBJS= @LIBOBJS@
|
||
|
|
|
||
|
|
PYTHON= python$(EXE)
|
||
|
|
BUILDPYTHON= python$(BUILDEXE)
|
||
|
|
+HOSTPYTHON= $(BUILDPYTHON)
|
||
|
|
|
||
|
|
PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
|
||
|
|
_PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
|
||
|
|
@@ -239,6 +240,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
|
||
|
|
##########################################################################
|
||
|
|
# Parser
|
||
|
|
PGEN= Parser/pgen$(EXE)
|
||
|
|
+HOSTPGEN= $(PGEN)$(EXE)
|
||
|
|
|
||
|
|
PSRCS= \
|
||
|
|
Parser/acceler.c \
|
||
|
|
@@ -451,7 +453,7 @@ build_all_generate_profile:
|
||
|
|
|
||
|
|
run_profile_task:
|
||
|
|
: # FIXME: can't run for a cross build
|
||
|
|
- $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK)
|
||
|
|
+ $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK)
|
||
|
|
|
||
|
|
build_all_use_profile:
|
||
|
|
$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use -fprofile-correction"
|
||
|
|
@@ -640,7 +642,7 @@ $(IO_OBJS): $(IO_H)
|
||
|
|
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
|
||
|
|
@$(MKDIR_P) Include
|
||
|
|
$(MAKE) $(PGEN)
|
||
|
|
- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
||
|
|
+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
||
|
|
$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
|
||
|
|
$(MAKE) $(GRAMMAR_H)
|
||
|
|
touch $(GRAMMAR_C)
|
||
|
|
@@ -820,7 +822,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
|
||
|
|
######################################################################
|
||
|
|
|
||
|
|
TESTOPTS= $(EXTRATESTOPTS)
|
||
|
|
-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
|
||
|
|
+TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) $(TESTPYTHONOPTS)
|
||
|
|
TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
|
||
|
|
TESTTIMEOUT= 3600
|
||
|
|
|
||
|
|
@@ -1229,7 +1231,7 @@ frameworkinstallstructure: $(LDLIBRARY)
|
||
|
|
fi; \
|
||
|
|
done
|
||
|
|
$(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
|
||
|
|
- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
|
||
|
|
+ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
|
||
|
|
$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
|
||
|
|
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
|
||
|
|
$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
|
||
|
|
@@ -1288,7 +1290,7 @@ config.status: $(srcdir)/configure
|
||
|
|
|
||
|
|
# Run reindent on the library
|
||
|
|
reindent:
|
||
|
|
- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
|
||
|
|
+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
|
||
|
|
|
||
|
|
# Rerun configure with the same options as it was run last time,
|
||
|
|
# provided the config.status script exists
|
||
|
|
@@ -1414,7 +1416,7 @@ funny:
|
||
|
|
|
||
|
|
# Perform some verification checks on any modified files.
|
||
|
|
patchcheck:
|
||
|
|
- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
|
||
|
|
+ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
|
||
|
|
|
||
|
|
# Dependencies
|
||
|
|
|