summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-05-10 17:13:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 14:01:47 +0100
commit74684e30ea936b957817dc5e8a6782432c0460b3 (patch)
tree3effcb024d475556051f547e82ef114b066ee2a8 /meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
parent3266238516fd1214d97b7f606733cbfe655779fd (diff)
downloadpoky-74684e30ea936b957817dc5e8a6782432c0460b3.tar.gz
python: update to 3.5.3
Prior versions of python do not support openssl 1.1; updating to Python 3.6 on the other hand is a lot more involved, and so should be done by a specialist/maintainer. LICENSE checksum change due to copyright years. Drop upstreamed python3-fix-CVE-2016-1000110.patch Rebase upstream-random-fixes.patch (taken from https://github.com/python/cpython/commit/ff558f5aba40bd173f336503def886a12f8db016 ) Rebase 0001-Do-not-use-the-shell-version-of-python-config-that-w.patch Rebase 000-cross-compile.patch (From OE-Core rev: b7b982a29e5d14c558b5fc25b4dc727810510ade) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-cross-compile-support.patch')
-rw-r--r--meta/recipes-devtools/python/python3/0001-cross-compile-support.patch93
1 files changed, 93 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch b/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
new file mode 100644
index 0000000000..118d75ddc5
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
@@ -0,0 +1,93 @@
1From 624c029abcc73c724020ccea9a2b4b5b5c00f2a6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 31 Mar 2017 15:42:46 +0300
4Subject: [PATCH] cross-compile support
5
6We cross compile python. This patch uses tools from host/native
7python instead of in-tree tools
8
9-Khem
10
11Upstream-Status: Inappropriate[Configuration Specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 Makefile.pre.in | 14 ++++++++------
15 1 file changed, 8 insertions(+), 6 deletions(-)
16
17diff --git a/Makefile.pre.in b/Makefile.pre.in
18index a88b7d5..7cb8bb3 100644
19--- a/Makefile.pre.in
20+++ b/Makefile.pre.in
21@@ -221,6 +221,7 @@ LIBOBJS= @LIBOBJS@
22
23 PYTHON= python$(EXE)
24 BUILDPYTHON= python$(BUILDEXE)
25+HOSTPYTHON= $(BUILDPYTHON)
26
27 PYTHON_FOR_GEN=@PYTHON_FOR_GEN@
28 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
29@@ -280,6 +281,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
30 ##########################################################################
31 # Parser
32 PGEN= Parser/pgen$(EXE)
33+HOSTPGEN= $(PGEN)$(EXE)
34
35 PSRCS= \
36 Parser/acceler.c \
37@@ -510,7 +512,7 @@ build_all_generate_profile:
38
39 run_profile_task:
40 : # FIXME: can't run for a cross build
41- $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
42+ $(LLVM_PROF_FILE) $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) || true
43
44 build_all_merge_profile:
45 $(LLVM_PROF_MERGER)
46@@ -787,7 +789,7 @@ $(IO_OBJS): $(IO_H)
47
48 $(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN)
49 @$(MKDIR_P) Include
50- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
51+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
52 $(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H)
53 touch $(GRAMMAR_C)
54
55@@ -976,7 +978,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS)
56 ######################################################################
57
58 TESTOPTS= $(EXTRATESTOPTS)
59-TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
60+TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) $(TESTPYTHONOPTS)
61 TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
62 TESTTIMEOUT= 3600
63
64@@ -1468,7 +1470,7 @@ frameworkinstallstructure: $(LDLIBRARY)
65 fi; \
66 done
67 $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
68- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
69+ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
70 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
71 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
72 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
73@@ -1534,7 +1536,7 @@ config.status: $(srcdir)/configure
74
75 # Run reindent on the library
76 reindent:
77- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
78+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
79
80 # Rerun configure with the same options as it was run last time,
81 # provided the config.status script exists
82@@ -1674,7 +1676,7 @@ funny:
83
84 # Perform some verification checks on any modified files.
85 patchcheck: all
86- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
87+ $(RUNSHARED) ./$(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
88
89 # Dependencies
90
91--
922.11.0
93