diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-02-26 09:47:33 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 14:01:12 +0000 |
commit | 8a33c5dd3be1a0f1697cf27291947bc91550050e (patch) | |
tree | 4fbe71a105c1e95492f6f6000bce343f004b8574 | |
parent | 5c6d9a14adf600f7b28ee6d643a07df9abb97999 (diff) | |
download | poky-8a33c5dd3be1a0f1697cf27291947bc91550050e.tar.gz |
python3: Fix race condition at high parallelism factor
Backport a patch to fix race condition as reported here
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5884
[YOCTO #5884]
(From OE-Core rev: 209a019b12f2941f8aefac9f192e9cdf691196e3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python3-native_3.3.3.bb | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.3.3.bb | 1 |
3 files changed, 28 insertions, 0 deletions
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 26b811fc5c..97bf3b5297 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 \ | |||
22 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ | 22 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ |
23 | file://sysroot-include-headers.patch \ | 23 | file://sysroot-include-headers.patch \ |
24 | file://unixccompiler.patch \ | 24 | file://unixccompiler.patch \ |
25 | file://fix-ast.h-dependency.patch \ | ||
25 | ${DISTRO_SRC_URI} \ | 26 | ${DISTRO_SRC_URI} \ |
26 | " | 27 | " |
27 | SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c" | 28 | 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 0000000000..77c220aa82 --- /dev/null +++ b/meta/recipes-devtools/python/python3/fix-ast.h-dependency.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Fix a missed dependency on ast.h which can result in race condition | ||
2 | at high parallel build | ||
3 | |||
4 | It fixed here | ||
5 | |||
6 | http://hg.python.org/cpython/rev/cfe0a293551f | ||
7 | |||
8 | [YOCTO #5884] | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | Index: Python-3.3.3/Makefile.pre.in | ||
14 | =================================================================== | ||
15 | --- Python-3.3.3.orig/Makefile.pre.in 2014-02-26 09:33:13.868288863 -0800 | ||
16 | +++ Python-3.3.3/Makefile.pre.in 2014-02-26 09:36:27.348292492 -0800 | ||
17 | @@ -853,7 +853,8 @@ | ||
18 | $(srcdir)/Include/warnings.h \ | ||
19 | $(srcdir)/Include/weakrefobject.h \ | ||
20 | pyconfig.h \ | ||
21 | - $(PARSER_HEADERS) | ||
22 | + $(PARSER_HEADERS) \ | ||
23 | + $(AST_H) | ||
24 | |||
25 | $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) | ||
26 | |||
diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb index d359863833..5d1ef5b314 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 \ | |||
17 | file://130-readline-setup.patch \ | 17 | file://130-readline-setup.patch \ |
18 | file://150-fix-setupterm.patch \ | 18 | file://150-fix-setupterm.patch \ |
19 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ | 19 | file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ |
20 | file://fix-ast.h-dependency.patch \ | ||
20 | ${DISTRO_SRC_URI} \ | 21 | ${DISTRO_SRC_URI} \ |
21 | " | 22 | " |
22 | 23 | ||