Patchwork python3: Fix race condition at high parallelism factor

login
register
mail settings
Submitter Khem Raj
Date Feb. 26, 2014, 5:47 p.m.
Message ID <1393436853-23869-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/67489/
State Accepted
Commit 8a33c5dd3be1a0f1697cf27291947bc91550050e
Headers show

Comments

Khem Raj - Feb. 26, 2014, 5:47 p.m.
Backport a patch to fix race condition as reported here

https://bugzilla.yoctoproject.org/show_bug.cgi?id=5884

[YOCTO #5884]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../python/python3-native_3.3.3.bb                 |  1 +
 .../python/python3/fix-ast.h-dependency.patch      | 26 ++++++++++++++++++++++
 meta/recipes-devtools/python/python3_3.3.3.bb      |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch

Patch

diff --git a/meta/recipes-devtools/python/python3-native_3.3.3.bb b/meta/recipes-devtools/python/python3-native_3.3.3.bb
index 26b811f..97bf3b5 100644
--- a/meta/recipes-devtools/python/python3-native_3.3.3.bb
+++ b/meta/recipes-devtools/python/python3-native_3.3.3.bb
@@ -22,6 +22,7 @@  file://shutil-follow-symlink-fix.patch \
 file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
 file://sysroot-include-headers.patch \
 file://unixccompiler.patch \
+file://fix-ast.h-dependency.patch \
 ${DISTRO_SRC_URI} \
 "
 SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c"
diff --git a/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch b/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch
new file mode 100644
index 0000000..77c220a
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch
@@ -0,0 +1,26 @@ 
+Fix a missed dependency on ast.h which can result in race condition
+at high parallel build
+
+It fixed here
+
+http://hg.python.org/cpython/rev/cfe0a293551f
+
+[YOCTO #5884]
+
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: Python-3.3.3/Makefile.pre.in
+===================================================================
+--- Python-3.3.3.orig/Makefile.pre.in	2014-02-26 09:33:13.868288863 -0800
++++ Python-3.3.3/Makefile.pre.in	2014-02-26 09:36:27.348292492 -0800
+@@ -853,7 +853,8 @@
+ 		$(srcdir)/Include/warnings.h \
+ 		$(srcdir)/Include/weakrefobject.h \
+ 		pyconfig.h \
+-		$(PARSER_HEADERS)
++		$(PARSER_HEADERS) \
++		$(AST_H)
+ 
+ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
+ 
diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb
index d359863..5d1ef5b 100644
--- a/meta/recipes-devtools/python/python3_3.3.3.bb
+++ b/meta/recipes-devtools/python/python3_3.3.3.bb
@@ -17,6 +17,7 @@  file://110-enable-zlib.patch \
 file://130-readline-setup.patch \
 file://150-fix-setupterm.patch \
 file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
+file://fix-ast.h-dependency.patch \
 ${DISTRO_SRC_URI} \
 "