diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-05-10 17:13:19 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-18 14:01:47 +0100 |
| commit | 74684e30ea936b957817dc5e8a6782432c0460b3 (patch) | |
| tree | 3effcb024d475556051f547e82ef114b066ee2a8 /meta/recipes-devtools/python/python3/000-cross-compile.patch | |
| parent | 3266238516fd1214d97b7f606733cbfe655779fd (diff) | |
| download | poky-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/000-cross-compile.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3/000-cross-compile.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/meta/recipes-devtools/python/python3/000-cross-compile.patch deleted file mode 100644 index 2d822218f4..0000000000 --- a/meta/recipes-devtools/python/python3/000-cross-compile.patch +++ /dev/null | |||
| @@ -1,85 +0,0 @@ | |||
| 1 | We cross compile python. This patch uses tools from host/native | ||
| 2 | python instead of in-tree tools | ||
| 3 | |||
| 4 | -Khem | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate[Configuration Specific] | ||
| 7 | |||
| 8 | --- | ||
| 9 | Makefile.pre.in | 25 +++++++++++++------------ | ||
| 10 | 1 file changed, 13 insertions(+), 12 deletions(-) | ||
| 11 | |||
| 12 | Index: Python-3.5.2/Makefile.pre.in | ||
| 13 | =================================================================== | ||
| 14 | --- Python-3.5.2.orig/Makefile.pre.in | ||
| 15 | +++ Python-3.5.2/Makefile.pre.in | ||
| 16 | @@ -220,6 +220,7 @@ LIBOBJS= @LIBOBJS@ | ||
| 17 | |||
| 18 | PYTHON= python$(EXE) | ||
| 19 | BUILDPYTHON= python$(BUILDEXE) | ||
| 20 | +HOSTPYTHON= $(BUILDPYTHON) | ||
| 21 | |||
| 22 | cross_compiling=@cross_compiling@ | ||
| 23 | PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ | ||
| 24 | @@ -279,6 +280,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ | ||
| 25 | ########################################################################## | ||
| 26 | # Parser | ||
| 27 | PGEN= Parser/pgen$(EXE) | ||
| 28 | +HOSTPGEN= $(PGEN)$(EXE) | ||
| 29 | |||
| 30 | PSRCS= \ | ||
| 31 | Parser/acceler.c \ | ||
| 32 | @@ -509,7 +511,7 @@ build_all_generate_profile: | ||
| 33 | |||
| 34 | run_profile_task: | ||
| 35 | : # FIXME: can't run for a cross build | ||
| 36 | - $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true | ||
| 37 | + $(LLVM_PROF_FILE) $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) || true | ||
| 38 | |||
| 39 | build_all_merge_profile: | ||
| 40 | $(LLVM_PROF_MERGER) | ||
| 41 | @@ -792,7 +794,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) | ||
| 42 | @$(MKDIR_P) Include | ||
| 43 | # Avoid copying the file onto itself for an in-tree build | ||
| 44 | if test "$(cross_compiling)" != "yes"; then \ | ||
| 45 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ | ||
| 46 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ | ||
| 47 | else \ | ||
| 48 | cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \ | ||
| 49 | mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \ | ||
| 50 | @@ -990,7 +992,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth | ||
| 51 | ###################################################################### | ||
| 52 | |||
| 53 | TESTOPTS= $(EXTRATESTOPTS) | ||
| 54 | -TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS) | ||
| 55 | +TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) $(TESTPYTHONOPTS) | ||
| 56 | TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py | ||
| 57 | TESTTIMEOUT= 3600 | ||
| 58 | |||
| 59 | @@ -1481,7 +1483,7 @@ frameworkinstallstructure: $(LDLIBRARY) | ||
| 60 | fi; \ | ||
| 61 | done | ||
| 62 | $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers | ||
| 63 | - sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist | ||
| 64 | + sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist | ||
| 65 | $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current | ||
| 66 | $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) | ||
| 67 | $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers | ||
| 68 | @@ -1547,7 +1549,7 @@ config.status: $(srcdir)/configure | ||
| 69 | |||
| 70 | # Run reindent on the library | ||
| 71 | reindent: | ||
| 72 | - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib | ||
| 73 | + $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib | ||
| 74 | |||
| 75 | # Rerun configure with the same options as it was run last time, | ||
| 76 | # provided the config.status script exists | ||
| 77 | @@ -1683,7 +1685,7 @@ funny: | ||
| 78 | |||
| 79 | # Perform some verification checks on any modified files. | ||
| 80 | patchcheck: all | ||
| 81 | - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py | ||
| 82 | + $(RUNSHARED) ./$(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py | ||
| 83 | |||
| 84 | # Dependencies | ||
| 85 | |||
