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.patch38
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/meta/recipes-devtools/python/python3/000-cross-compile.patch
index 28fe70adb3..2d822218f4 100644
--- a/meta/recipes-devtools/python/python3/000-cross-compile.patch
+++ b/meta/recipes-devtools/python/python3/000-cross-compile.patch
@@ -9,19 +9,19 @@ 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
12Index: Python-3.5.1/Makefile.pre.in 12Index: Python-3.5.2/Makefile.pre.in
13=================================================================== 13===================================================================
14--- Python-3.5.1.orig/Makefile.pre.in 14--- Python-3.5.2.orig/Makefile.pre.in
15+++ Python-3.5.1/Makefile.pre.in 15+++ Python-3.5.2/Makefile.pre.in
16@@ -220,6 +220,7 @@ LIBOBJS= @LIBOBJS@ 16@@ -220,6 +220,7 @@ LIBOBJS= @LIBOBJS@
17 17
18 PYTHON= python$(EXE) 18 PYTHON= python$(EXE)
19 BUILDPYTHON= python$(BUILDEXE) 19 BUILDPYTHON= python$(BUILDEXE)
20+HOSTPYTHON= $(BUILDPYTHON) 20+HOSTPYTHON= $(BUILDPYTHON)
21 21
22 cross_compiling=@cross_compiling@
22 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ 23 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
23 _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ 24@@ -279,6 +280,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
24@@ -276,6 +277,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
25 ########################################################################## 25 ##########################################################################
26 # Parser 26 # Parser
27 PGEN= Parser/pgen$(EXE) 27 PGEN= Parser/pgen$(EXE)
@@ -29,7 +29,7 @@ Index: Python-3.5.1/Makefile.pre.in
29 29
30 PSRCS= \ 30 PSRCS= \
31 Parser/acceler.c \ 31 Parser/acceler.c \
32@@ -506,7 +508,7 @@ build_all_generate_profile: 32@@ -509,7 +511,7 @@ build_all_generate_profile:
33 33
34 run_profile_task: 34 run_profile_task:
35 : # FIXME: can't run for a cross build 35 : # FIXME: can't run for a cross build
@@ -38,16 +38,16 @@ Index: Python-3.5.1/Makefile.pre.in
38 38
39 build_all_merge_profile: 39 build_all_merge_profile:
40 $(LLVM_PROF_MERGER) 40 $(LLVM_PROF_MERGER)
41@@ -779,7 +781,7 @@ $(IO_OBJS): $(IO_H) 41@@ -792,7 +794,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
42 42 @$(MKDIR_P) Include
43 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) 43 # Avoid copying the file onto itself for an in-tree build
44 @$(MKDIR_P) Include 44 if test "$(cross_compiling)" != "yes"; then \
45- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 45- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
46+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 46+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
47 $(GRAMMAR_C): $(GRAMMAR_H) 47 else \
48 touch $(GRAMMAR_C) 48 cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
49 49 mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
50@@ -968,7 +970,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth 50@@ -990,7 +992,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
51 ###################################################################### 51 ######################################################################
52 52
53 TESTOPTS= $(EXTRATESTOPTS) 53 TESTOPTS= $(EXTRATESTOPTS)
@@ -56,7 +56,7 @@ Index: Python-3.5.1/Makefile.pre.in
56 TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py 56 TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
57 TESTTIMEOUT= 3600 57 TESTTIMEOUT= 3600
58 58
59@@ -1455,7 +1457,7 @@ frameworkinstallstructure: $(LDLIBRARY) 59@@ -1481,7 +1483,7 @@ frameworkinstallstructure: $(LDLIBRARY)
60 fi; \ 60 fi; \
61 done 61 done
62 $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers 62 $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
@@ -65,7 +65,7 @@ Index: Python-3.5.1/Makefile.pre.in
65 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current 65 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
66 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) 66 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
67 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers 67 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
68@@ -1521,7 +1523,7 @@ config.status: $(srcdir)/configure 68@@ -1547,7 +1549,7 @@ config.status: $(srcdir)/configure
69 69
70 # Run reindent on the library 70 # Run reindent on the library
71 reindent: 71 reindent:
@@ -74,7 +74,7 @@ Index: Python-3.5.1/Makefile.pre.in
74 74
75 # 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,
76 # provided the config.status script exists 76 # provided the config.status script exists
77@@ -1656,7 +1658,7 @@ funny: 77@@ -1683,7 +1685,7 @@ funny:
78 78
79 # Perform some verification checks on any modified files. 79 # Perform some verification checks on any modified files.
80 patchcheck: all 80 patchcheck: all
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-09 21:26:08 +0000