Skip to contentSkip to conversation

python-native: Fixes PGEN linking errors Changes Makefile rules to avoid parallel make races when trying to build Parser/PGEN

PATCH In review Alejandro Hernandez 2 participants 3 messages Feb 24, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python-native: Fixes PGEN linking errors Changes Makefile rules to avoid parallel make races when trying to build Parser/PGEN

---
 .../avoid_parallel_make_races_on_pgen.patch        | 27 ++++++++++++++++++++++
 .../recipes-devtools/python/python-native_2.7.9.bb |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch
meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch new file +27 -0
new file mode 100644
index 0000000..1a8f68e
@@ -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 <[email protected]>
+Signed-Off-By: Alejandro Hernandez <[email protected]>
+
+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)
meta/recipes-devtools/python/python-native_2.7.9.bb +1 -0
index 54be2ea..28aaa11 100644
@@ -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}"
 
Signature · 1 line
1.9.1
#1 lore raw

Hi Alejandro,

Quoted 2 lines · Alejandro Hernandez

+Upstream-Status: Inappropriate [embedded specific]

This is a genuine build race in the make files and entirely appropriate for upstream. Can you send them a patch?

Ross

#2 lore raw
Quoted 10 lines · Ross

Hi Alejandro,

On 24 February 2015 at 06:08, Alejandro Hernandez <[email protected] <mailto:[email protected]>> wrote:

+Upstream-Status: Inappropriate [embedded specific]

This is a genuine build race in the make files and entirely appropriate for upstream. Can you send them a patch?

Ross

Will do, should I send the patch again to the list without that info?