summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2015-03-23 15:33:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-25 12:39:39 +0000
commit65a8408155fa490a7f5438a1aa8c501433fe2c33 (patch)
tree235b4e4ee3f3fe6094b3578e7dc246316ff2ff9b
parent2a473ac17a6cb4857f18f9875ac84f59ee17cee4 (diff)
downloadpoky-65a8408155fa490a7f5438a1aa8c501433fe2c33.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 (From OE-Core rev: 4f0d1015aa3331ae7b376f836d3188b6017abfb1) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-native/avoid_parallel_make_races_on_pgen.patch2
-rw-r--r--meta/recipes-devtools/python/python/avoid_parallel_make_races_on_pgen.patch27
-rw-r--r--meta/recipes-devtools/python/python_2.7.9.bb1
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 @@
1Upstream-Status: Inappropriate [embedded specific] 1Upstream-Status: Pending
2 2
3Avoids parallel make races linking errors when making Parser/PGEN 3Avoids parallel make races linking errors when making Parser/PGEN
4 4
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 @@
1Upstream-Status: Pending
2
3Avoids parallel make races linking errors when making Parser/PGEN
4
5- Implements Richard Purdie's idea
6
7Signed-Off-By: Richard Purdie <richard.purdie@linuxfoundation.org>
8Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
9
10Index: Python-2.7.9/Makefile.pre.in
11===================================================================
12--- Python-2.7.9.orig/Makefile.pre.in
13+++ Python-2.7.9/Makefile.pre.in
14@@ -611,12 +611,10 @@ Modules/grpmodule.o: $(srcdir)/Modules/g
15
16 Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h
17
18-$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
19+$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN)
20 @$(MKDIR_P) Include
21- $(MAKE) $(PGEN)
22 $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
23 $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
24- $(MAKE) $(GRAMMAR_H)
25 touch $(GRAMMAR_C)
26
27 $(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 += "\
25 file://run-ptest \ 25 file://run-ptest \
26 file://parallel-makeinst-create-bindir.patch \ 26 file://parallel-makeinst-create-bindir.patch \
27 file://use_sysroot_ncurses_instead_of_host.patch \ 27 file://use_sysroot_ncurses_instead_of_host.patch \
28 file://avoid_parallel_make_races_on_pgen.patch \
28" 29"
29 30
30S = "${WORKDIR}/Python-${PV}" 31S = "${WORKDIR}/Python-${PV}"