mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 15:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

python3-native: correctly invoke regen-importlib make target

Browse Source 
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)

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>
This commit is contained in:
Joe Slater
2018-04-23 10:21:42 -07:00
committed by Richard Purdie
parent 78c0b21e3d
commit 1d708bb185
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-devtools/python/python3-native_3.5.5.bb
View File

@@ -25,6 +25,7 @@ file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \ file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \
file://support_SOURCE_DATE_EPOCH_in_py_compile.patch \ file://support_SOURCE_DATE_EPOCH_in_py_compile.patch \
file://regen-all.patch \
" "
SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0" SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0"
@@ -62,9 +63,9 @@ do_configure_append() {
# Regenerate all of the generated files # Regenerate all of the generated files
# This ensures that pgen and friends get created during the compile phase # This ensures that pgen and friends get created during the compile phase
#
do_compile_prepend() { do_compile_prepend() {
# Has to be done ahead of other regen- targets due to https://bugs.python.org/issue33080 # Assuming https://bugs.python.org/issue33080 has been addressed in Makefile.
oe_runmake regen-importlib
oe_runmake regen-all oe_runmake regen-all
} }

25
meta/recipes-devtools/python/python3/regen-all.patch Normal file
View File

@@ -0,0 +1,25 @@
python3-native: run regen-importlib target correctly
regen-importlib depends on other regen- targets, so we must be sure to
run it after (most of) the others. In reality, we do not need to run it
at all since "make" will invoke it, if necessary. We do not want to
rely on that, though.
Upstream-Status: Pending
Signed-off-by: Joe Slater <joe.slater@windriver.com>
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -709,7 +709,8 @@ regen-importlib: Programs/_freeze_import
############################################################################
# Regenerate all generated files
-regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-ast regen-importlib
+regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-ast
+ $(MAKE) regen-importlib
############################################################################
# Special rules for object files