summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3/000-cross-compile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python/python3/000-cross-compile.patch')
-rw-r--r--meta/recipes-devtools/python/python3/000-cross-compile.patch36
1 files changed, 19 insertions, 17 deletions
diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/meta/recipes-devtools/python/python3/000-cross-compile.patch
index 2506a590c0..a3ffe3bea8 100644
--- a/meta/recipes-devtools/python/python3/000-cross-compile.patch
+++ b/meta/recipes-devtools/python/python3/000-cross-compile.patch
@@ -9,9 +9,11 @@ Upstream-Status: Inappropriate[Configuration Specific]
9 Makefile.pre.in | 25 +++++++++++++------------ 9 Makefile.pre.in | 25 +++++++++++++------------
10 1 file changed, 13 insertions(+), 12 deletions(-) 10 1 file changed, 13 insertions(+), 12 deletions(-)
11 11
12--- a/Makefile.pre.in 12Index: Python-3.5.0/Makefile.pre.in
13+++ b/Makefile.pre.in 13===================================================================
14@@ -193,6 +193,7 @@ LIBOBJS= @LIBOBJS@ 14--- Python-3.5.0.orig/Makefile.pre.in
15+++ Python-3.5.0/Makefile.pre.in
16@@ -215,6 +215,7 @@ LIBOBJS= @LIBOBJS@
15 17
16 PYTHON= python$(EXE) 18 PYTHON= python$(EXE)
17 BUILDPYTHON= python$(BUILDEXE) 19 BUILDPYTHON= python$(BUILDEXE)
@@ -19,7 +21,7 @@ Upstream-Status: Inappropriate[Configuration Specific]
19 21
20 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ 22 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
21 _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ 23 _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
22@@ -239,6 +240,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ 24@@ -272,6 +273,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
23 ########################################################################## 25 ##########################################################################
24 # Parser 26 # Parser
25 PGEN= Parser/pgen$(EXE) 27 PGEN= Parser/pgen$(EXE)
@@ -27,7 +29,7 @@ Upstream-Status: Inappropriate[Configuration Specific]
27 29
28 PSRCS= \ 30 PSRCS= \
29 Parser/acceler.c \ 31 Parser/acceler.c \
30@@ -451,7 +453,7 @@ build_all_generate_profile: 32@@ -494,7 +496,7 @@ build_all_generate_profile:
31 33
32 run_profile_task: 34 run_profile_task:
33 : # FIXME: can't run for a cross build 35 : # FIXME: can't run for a cross build
@@ -35,17 +37,17 @@ Upstream-Status: Inappropriate[Configuration Specific]
35+ $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) 37+ $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK)
36 38
37 build_all_use_profile: 39 build_all_use_profile:
38 $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use -fprofile-correction" 40 $(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-use -fprofile-correction"
39@@ -640,7 +642,7 @@ $(IO_OBJS): $(IO_H) 41@@ -764,7 +766,7 @@ $(IO_OBJS): $(IO_H)
40 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) 42
43 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
41 @$(MKDIR_P) Include 44 @$(MKDIR_P) Include
42 $(MAKE) $(PGEN)
43- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 45- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
44+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 46+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
45 $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) 47 $(GRAMMAR_C): $(GRAMMAR_H)
46 $(MAKE) $(GRAMMAR_H)
47 touch $(GRAMMAR_C) 48 touch $(GRAMMAR_C)
48@@ -820,7 +822,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho 49
50@@ -953,7 +955,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
49 ###################################################################### 51 ######################################################################
50 52
51 TESTOPTS= $(EXTRATESTOPTS) 53 TESTOPTS= $(EXTRATESTOPTS)
@@ -54,7 +56,7 @@ Upstream-Status: Inappropriate[Configuration Specific]
54 TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py 56 TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
55 TESTTIMEOUT= 3600 57 TESTTIMEOUT= 3600
56 58
57@@ -1229,7 +1231,7 @@ frameworkinstallstructure: $(LDLIBRARY) 59@@ -1440,7 +1442,7 @@ frameworkinstallstructure: $(LDLIBRARY)
58 fi; \ 60 fi; \
59 done 61 done
60 $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers 62 $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
@@ -63,7 +65,7 @@ Upstream-Status: Inappropriate[Configuration Specific]
63 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current 65 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
64 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) 66 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
65 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers 67 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
66@@ -1288,7 +1290,7 @@ config.status: $(srcdir)/configure 68@@ -1506,7 +1508,7 @@ config.status: $(srcdir)/configure
67 69
68 # Run reindent on the library 70 # Run reindent on the library
69 reindent: 71 reindent:
@@ -72,12 +74,12 @@ Upstream-Status: Inappropriate[Configuration Specific]
72 74
73 # Rerun configure with the same options as it was run last time, 75 # Rerun configure with the same options as it was run last time,
74 # provided the config.status script exists 76 # provided the config.status script exists
75@@ -1414,7 +1416,7 @@ funny: 77@@ -1639,7 +1641,7 @@ funny:
76 78
77 # Perform some verification checks on any modified files. 79 # Perform some verification checks on any modified files.
78 patchcheck: 80 patchcheck: all
79- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py 81- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
80+ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py 82+ $(RUNSHARED) ./$(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
81 83
82 # Dependencies 84 # Dependencies
83 85