python3: do not compile .pyc in parallel during do_install()

(From OE-Core rev: af7f5590dc49ec33268939b53879a6d011306114)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 60 insertions, 2 deletions

diff --git a/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch b/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
new file mode 100644
index 0000000000..b1bceac512
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Makefile-do-not-compile-.pyc-in-parallel.patch
@@ -0,0 +1,58 @@
+From c501e121a872cbcef8ffe626c1de173a125be9f8 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 16 Jan 2020 12:34:20 +0100
+Subject: [PATCH] Makefile: do not compile .pyc in parallel
+
+This was found to break reproducibility, and produce strange file ownership
+races.
+
+The upstream commit introducing the change was:
+https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Makefile.pre.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 1241112..5dfdf44 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1457,30 +1457,30 @@ libinstall:     build_all $(srcdir)/Modules/xxmodule.c
+        fi
+        -PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-               -j0 -d $(LIBDEST) -f \
++               -d $(LIBDEST) -f \
+                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+                $(DESTDIR)$(LIBDEST)
+        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+                $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-               -j0 -d $(LIBDEST) -f \
++               -d $(LIBDEST) -f \
+                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+                $(DESTDIR)$(LIBDEST)
+        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+                $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-               -j0 -d $(LIBDEST) -f \
++               -d $(LIBDEST) -f \
+                -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+                $(DESTDIR)$(LIBDEST)
+        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+-               -j0 -d $(LIBDEST)/site-packages -f \
++               -d $(LIBDEST)/site-packages -f \
+                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+                $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
+-               -j0 -d $(LIBDEST)/site-packages -f \
++               -d $(LIBDEST)/site-packages -f \
+                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+                $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+-               -j0 -d $(LIBDEST)/site-packages -f \
++               -d $(LIBDEST)/site-packages -f \
+                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+                $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
diff --git a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
index 03719cafcd..03f60088fe 100644
--- a/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
+++ b/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
@@ -1,4 +1,4 @@
-From 14eecf00459c0af698ed811e4f8bea460aada681 Mon Sep 17 00:00:00 2001
+From 77b7af7859bb925c31c5bcbf33f30569a0bc1d40 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 31 Jan 2019 16:46:30 +0100
 Subject: [PATCH] distutils/sysconfig: append
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index 3105f0d176..6fe9839f77 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
-From 6ca960869738fc89041a2e672d8e28b51e73d3c6 Mon Sep 17 00:00:00 2001
+From b1f68fe102b289a10504fae716a9eaa8677e3c5b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 14 May 2013 15:00:26 -0700
 Subject: [PATCH] python3: Add target and native recipes