Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From c501e121a872cbcef8ffe626c1de173a125be9f8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 16 Jan 2020 12:34:20 +0100 |
| 4 | Subject: [PATCH] Makefile: do not compile .pyc in parallel |
| 5 | |
| 6 | This was found to break reproducibility, and produce strange file ownership |
| 7 | races. |
| 8 | |
| 9 | The upstream commit introducing the change was: |
| 10 | https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504 |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | Makefile.pre.in | 12 ++++++------ |
| 16 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 17 | |
| 18 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
| 19 | index 1241112..5dfdf44 100644 |
| 20 | --- a/Makefile.pre.in |
| 21 | +++ b/Makefile.pre.in |
| 22 | @@ -1457,30 +1457,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c |
| 23 | fi |
| 24 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 25 | $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 26 | - -j0 -d $(LIBDEST) -f \ |
| 27 | + -d $(LIBDEST) -f \ |
| 28 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 29 | $(DESTDIR)$(LIBDEST) |
| 30 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 31 | $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 32 | - -j0 -d $(LIBDEST) -f \ |
| 33 | + -d $(LIBDEST) -f \ |
| 34 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 35 | $(DESTDIR)$(LIBDEST) |
| 36 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 37 | $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 38 | - -j0 -d $(LIBDEST) -f \ |
| 39 | + -d $(LIBDEST) -f \ |
| 40 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 41 | $(DESTDIR)$(LIBDEST) |
| 42 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 43 | $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 44 | - -j0 -d $(LIBDEST)/site-packages -f \ |
| 45 | + -d $(LIBDEST)/site-packages -f \ |
| 46 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 47 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 48 | $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 49 | - -j0 -d $(LIBDEST)/site-packages -f \ |
| 50 | + -d $(LIBDEST)/site-packages -f \ |
| 51 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 52 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 53 | $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 54 | - -j0 -d $(LIBDEST)/site-packages -f \ |
| 55 | + -d $(LIBDEST)/site-packages -f \ |
| 56 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 57 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 58 | $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt |