summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2018-04-23 10:21:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 17:56:57 +0100
commit3452141b0204f70896969d32602eadb4852fd731 (patch)
tree9fde3b830a9d818318d35b127af882224c126a0b
parentd85fcec56302a0a83ce82d128e50507fbea1de4c (diff)
downloadpoky-3452141b0204f70896969d32602eadb4852fd731.tar.gz
python3-native: correctly invoke regen-importlib make target
Redefiine regen-all in Makefile to invoke regen-importlib after building other regen- targets. Change the recipe to not build it before regen-all. This avoids trying to build it multiple times, which can occasionally fail. (From OE-Core rev: 72d62c9af07bf34bb8fbb3958742eb592985acc2) (From OE-Core rev: 5b9af58be9194233a05a10c3e5b5efd053cc28d2) Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.5.bb5
-rw-r--r--meta/recipes-devtools/python/python3/regen-all.patch25
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3-native_3.5.5.bb b/meta/recipes-devtools/python/python3-native_3.5.5.bb
index 962ccfcc4c..3098027d80 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.5.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.5.bb
@@ -25,6 +25,7 @@ file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
25file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ 25file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
26file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \ 26file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \
27file://support_SOURCE_DATE_EPOCH_in_py_compile.patch \ 27file://support_SOURCE_DATE_EPOCH_in_py_compile.patch \
28file://regen-all.patch \
28" 29"
29 30
30SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0" 31SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0"
@@ -62,9 +63,9 @@ do_configure_append() {
62 63
63# Regenerate all of the generated files 64# Regenerate all of the generated files
64# This ensures that pgen and friends get created during the compile phase 65# This ensures that pgen and friends get created during the compile phase
66#
65do_compile_prepend() { 67do_compile_prepend() {
66 # Has to be done ahead of other regen- targets due to https://bugs.python.org/issue33080 68 # Assuming https://bugs.python.org/issue33080 has been addressed in Makefile.
67 oe_runmake regen-importlib
68 oe_runmake regen-all 69 oe_runmake regen-all
69} 70}
70 71
diff --git a/meta/recipes-devtools/python/python3/regen-all.patch b/meta/recipes-devtools/python/python3/regen-all.patch
new file mode 100644
index 0000000000..36b9d9d919
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/regen-all.patch
@@ -0,0 +1,25 @@
1python3-native: run regen-importlib target correctly
2
3regen-importlib depends on other regen- targets, so we must be sure to
4run it after (most of) the others. In reality, we do not need to run it
5at all since "make" will invoke it, if necessary. We do not want to
6rely on that, though.
7
8Upstream-Status: Pending
9
10Signed-off-by: Joe Slater <joe.slater@windriver.com>
11
12
13
14--- a/Makefile.pre.in
15+++ b/Makefile.pre.in
16@@ -709,7 +709,8 @@ regen-importlib: Programs/_freeze_import
17 ############################################################################
18 # Regenerate all generated files
19
20-regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-ast regen-importlib
21+regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-ast
22+ $(MAKE) regen-importlib
23
24 ############################################################################
25 # Special rules for object files