diff options
| author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-02-24 00:08:08 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-24 23:12:18 +0000 |
| commit | 04819731e9696450dc5d59c07028e38a9d09a1d9 (patch) | |
| tree | 887b07802684ebac1900c9a33c251f47558a2f1d /meta/recipes-devtools | |
| parent | d6a2cf3cbef581478185c25d8a7a6109a201c583 (diff) | |
| download | ast2050-yocto-poky-04819731e9696450dc5d59c07028e38a9d09a1d9.zip ast2050-yocto-poky-04819731e9696450dc5d59c07028e38a9d09a1d9.tar.gz | |
python-native: Fixes PGEN linking errors Changes Makefile rules to avoid parallel make races when trying to build Parser/PGEN
(From OE-Core rev: f98cd3798837f2954443ca84a199158d9f47c3e8)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python-native_2.7.9.bb | 1 |
2 files changed, 28 insertions, 0 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 new file mode 100644 index 0000000..1a8f68e --- /dev/null +++ b/meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch @@ -0,0 +1,27 @@ +Upstream-Status: Inappropriate [embedded specific] + +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 +@@ -610,12 +610,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) + $(PGEN) $(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-native_2.7.9.bb b/meta/recipes-devtools/python/python-native_2.7.9.bb index 54be2ea..28aaa11 100644 --- a/meta/recipes-devtools/python/python-native_2.7.9.bb +++ b/meta/recipes-devtools/python/python-native_2.7.9.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://builddir.patch \ file://parallel-makeinst-create-bindir.patch \ file://revert_use_of_sysconfigdata.patch \ + file://avoid_parallel_make_races_on_pgen.patch \ " S = "${WORKDIR}/Python-${PV}" |
