diff options
| author |   Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-03-23 15:33:21 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-24 10:08:00 +0000 |
| commit | 4f0d1015aa3331ae7b376f836d3188b6017abfb1 (patch) | |
| tree | 63df261d558ee6f8c6fad41e7894449157572a7c | |
| parent | 2a5484a90513b58c829a916bfe5268a0fde3512a (diff) | |
| download | openembedded-core-4f0d1015aa3331ae7b376f836d3188b6017abfb1.tar.gz | |
python: Fix PGEN linking errors
Parallel make races when linking PGEN affects target's python
compilation as well, adds patch from python-native to modify the
Makefile and avoid parallel make races, also updates upstream status
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 29 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch b/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch index 1a8f68ebf3..5279e7c3b4 100644 --- a/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch +++ b/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch @@ -1,4 +1,4 @@ -Upstream-Status: Inappropriate [embedded specific] +Upstream-Status: Pending Avoids parallel make races linking errors when making Parser/PGEN diff --git a/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch b/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch new file mode 100644 index 0000000000..e9bae324f7 --- /dev/null +++ b/meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch @@ -0,0 +1,27 @@ +Upstream-Status: Pending + +Avoids parallel make races linking errors when making Parser/PGEN + +- Implements Richard Purdie's idea + +Signed-Off-By: Richard Purdie <richard.purdie@linuxfoundation.org> +Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> + +Index: Python-2.7.9/Makefile.pre.in +=================================================================== +--- Python-2.7.9.orig/Makefile.pre.in ++++ Python-2.7.9/Makefile.pre.in +@@ -611,12 +611,10 @@ Modules/grpmodule.o: $(srcdir)/Modules/g + + Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h + +-$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) ++$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN) + @$(MKDIR_P) Include +- $(MAKE) $(PGEN) + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) +- $(MAKE) $(GRAMMAR_H) + touch $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.9.bb index 4087c2cb13..6d5b42a42f 100644 --- a/meta/recipes-devtools/python/python_2.7.9.bb +++ b/meta/recipes-devtools/python/python_2.7.9.bb @@ -25,6 +25,7 @@ SRC_URI += "\ file://run-ptest \ file://parallel-makeinst-create-bindir.patch \ file://use_sysroot_ncurses_instead_of_host.patch \ + file://avoid_parallel_make_races_on_pgen.patch \ " S = "${WORKDIR}/Python-${PV}" |