diff options
| author | Derek Straka <derek@asterius.io> | 2018-01-30 12:22:49 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 11:06:27 +0000 |
| commit | 39e48c8b066518909ea647bb3168243061fc1414 (patch) | |
| tree | 4208257e1662982bd6fc9ea67b49c19de3245ba8 /meta/recipes-devtools/python/python3/0001-cross-compile-support.patch | |
| parent | 863df3c81f3f9786924c98aad01d1219c540fb26 (diff) | |
| download | poky-39e48c8b066518909ea647bb3168243061fc1414.tar.gz | |
python3: update target and native recipes to 3.5.4
Use the latest 3.5 version until the 3.6 migration is complete
Removed the following upstreamed patches:
- python3/Fix-29519-weakref-spewing-exceptions-during-interp-f.patch
- python3/upstream-random-fixes.patch
Rebased the following pathes:
- python3/0001-cross-compile-support.patch
Regenerated the manifest based on the latest release version
Updated the license checksum for the latest version that updated the
copyright dates
(From OE-Core rev: eb80d0391d7d4e83a61ed8850d936b102be3fa02)
Signed-off-by: Derek Straka <derek@asterius.io>
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.patch | 69 |
1 files changed, 36 insertions, 33 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 index 118d75ddc5..7cd7e3b490 100644 --- a/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch +++ b/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 624c029abcc73c724020ccea9a2b4b5b5c00f2a6 Mon Sep 17 00:00:00 2001 | 1 | From ecde3ea170999a9ef734e8af4d7c25be5ba81697 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 31 Mar 2017 15:42:46 +0300 | 3 | Date: Fri, 31 Mar 2017 15:42:46 +0300 |
| 4 | Subject: [PATCH] cross-compile support | 4 | Subject: [PATCH] cross-compile support |
| @@ -8,60 +8,63 @@ python instead of in-tree tools | |||
| 8 | 8 | ||
| 9 | -Khem | 9 | -Khem |
| 10 | 10 | ||
| 11 | Rebased on 3.5.4 | ||
| 12 | |||
| 11 | Upstream-Status: Inappropriate[Configuration Specific] | 13 | Upstream-Status: Inappropriate[Configuration Specific] |
| 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 14 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 15 | Signed-off-by: Derek Straka <derek@asterius.io> | ||
| 13 | --- | 16 | --- |
| 14 | Makefile.pre.in | 14 ++++++++------ | 17 | Makefile.pre.in | 14 ++++++++------ |
| 15 | 1 file changed, 8 insertions(+), 6 deletions(-) | 18 | 1 file changed, 8 insertions(+), 6 deletions(-) |
| 16 | 19 | ||
| 17 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 20 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
| 18 | index a88b7d5..7cb8bb3 100644 | 21 | index 144c1f8629..f252ac2417 100644 |
| 19 | --- a/Makefile.pre.in | 22 | --- a/Makefile.pre.in |
| 20 | +++ b/Makefile.pre.in | 23 | +++ b/Makefile.pre.in |
| 21 | @@ -221,6 +221,7 @@ LIBOBJS= @LIBOBJS@ | 24 | @@ -223,6 +223,7 @@ LIBOBJS= @LIBOBJS@ |
| 22 | 25 | ||
| 23 | PYTHON= python$(EXE) | 26 | PYTHON= python$(EXE) |
| 24 | BUILDPYTHON= python$(BUILDEXE) | 27 | BUILDPYTHON= python$(BUILDEXE) |
| 25 | +HOSTPYTHON= $(BUILDPYTHON) | 28 | +HOSTPYTHON= $(BUILDPYTHON) |
| 26 | 29 | ||
| 27 | PYTHON_FOR_GEN=@PYTHON_FOR_GEN@ | 30 | PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@ |
| 28 | PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ | 31 | PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ |
| 29 | @@ -280,6 +281,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ | 32 | @@ -277,6 +278,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ |
| 30 | ########################################################################## | 33 | ########################################################################## |
| 31 | # Parser | 34 | # Parser |
| 32 | PGEN= Parser/pgen$(EXE) | 35 | PGEN= Parser/pgen$(EXE) |
| 33 | +HOSTPGEN= $(PGEN)$(EXE) | 36 | +HOSTPGEN= $(PGEN)$(EXE) |
| 34 | 37 | ||
| 35 | PSRCS= \ | 38 | PSRCS= \ |
| 36 | Parser/acceler.c \ | 39 | Parser/acceler.c \ |
| 37 | @@ -510,7 +512,7 @@ build_all_generate_profile: | 40 | @@ -478,7 +480,7 @@ build_all_generate_profile: |
| 38 | 41 | ||
| 39 | run_profile_task: | 42 | run_profile_task: |
| 40 | : # FIXME: can't run for a cross build | 43 | : # FIXME: can't run for a cross build |
| 41 | - $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true | 44 | - $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true |
| 42 | + $(LLVM_PROF_FILE) $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) || true | 45 | + $(LLVM_PROF_FILE) $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) || true |
| 43 | 46 | ||
| 44 | build_all_merge_profile: | 47 | build_all_merge_profile: |
| 45 | $(LLVM_PROF_MERGER) | 48 | $(LLVM_PROF_MERGER) |
| 46 | @@ -787,7 +789,7 @@ $(IO_OBJS): $(IO_H) | 49 | @@ -772,7 +774,7 @@ regen-grammar: $(PGEN) |
| 47 | 50 | # Regenerate Include/graminit.h and Python/graminit.c | |
| 48 | $(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN) | 51 | # from Grammar/Grammar using pgen |
| 49 | @$(MKDIR_P) Include | 52 | @$(MKDIR_P) Include |
| 50 | - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) | 53 | - $(PGEN) $(srcdir)/Grammar/Grammar \ |
| 51 | + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) | 54 | + $(HOSTPGEN) $(srcdir)/Grammar/Grammar \ |
| 52 | $(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H) | 55 | $(srcdir)/Include/graminit.h \ |
| 53 | touch $(GRAMMAR_C) | 56 | $(srcdir)/Python/graminit.c |
| 54 | 57 | ||
| 55 | @@ -976,7 +978,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS) | 58 | @@ -978,7 +980,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS) |
| 56 | ###################################################################### | 59 | ###################################################################### |
| 57 | 60 | ||
| 58 | TESTOPTS= $(EXTRATESTOPTS) | 61 | TESTOPTS= $(EXTRATESTOPTS) |
| 59 | -TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS) | 62 | -TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS) |
| 60 | +TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) $(TESTPYTHONOPTS) | 63 | +TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) $(TESTPYTHONOPTS) |
| 61 | TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py | 64 | TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py |
| 62 | TESTTIMEOUT= 3600 | 65 | TESTTIMEOUT= 3600 |
| 63 | 66 | ||
| 64 | @@ -1468,7 +1470,7 @@ frameworkinstallstructure: $(LDLIBRARY) | 67 | @@ -1470,7 +1472,7 @@ frameworkinstallstructure: $(LDLIBRARY) |
| 65 | fi; \ | 68 | fi; \ |
| 66 | done | 69 | done |
| 67 | $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers | 70 | $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers |
| @@ -70,24 +73,24 @@ index a88b7d5..7cb8bb3 100644 | |||
| 70 | $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current | 73 | $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current |
| 71 | $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) | 74 | $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) |
| 72 | $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers | 75 | $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers |
| 73 | @@ -1534,7 +1536,7 @@ config.status: $(srcdir)/configure | 76 | @@ -1543,7 +1545,7 @@ Python/dtoa.o: Python/dtoa.c |
| 74 | 77 | ||
| 75 | # Run reindent on the library | 78 | # Run reindent on the library |
| 76 | reindent: | 79 | reindent: |
| 77 | - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib | 80 | - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib |
| 78 | + $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib | 81 | + $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib |
| 79 | 82 | ||
| 80 | # Rerun configure with the same options as it was run last time, | 83 | # Rerun configure with the same options as it was run last time, |
| 81 | # provided the config.status script exists | 84 | # provided the config.status script exists |
| 82 | @@ -1674,7 +1676,7 @@ funny: | 85 | @@ -1678,7 +1680,7 @@ funny: |
| 83 | 86 | ||
| 84 | # Perform some verification checks on any modified files. | 87 | # Perform some verification checks on any modified files. |
| 85 | patchcheck: all | 88 | patchcheck: @DEF_MAKE_RULE@ |
| 86 | - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py | 89 | - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py |
| 87 | + $(RUNSHARED) ./$(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py | 90 | + $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py |
| 88 | 91 | ||
| 89 | # Dependencies | 92 | # Dependencies |
| 90 | 93 | ||
| 91 | -- | 94 | -- |
| 92 | 2.11.0 | 95 | 2.11.0 |
| 93 | 96 | ||
