| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From c960837b8fd83074bab5148236f3d0595468cea4 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 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 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 6 | This was found to lock up builds, break reproducibility, and produce strange file ownership |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 7 | races. |
| 8 | |
| 9 | The upstream commit introducing the change was: |
| 10 | https://github.com/python/cpython/commit/1a2dd82f56bd813aacc570e172cefe55a8a41504 |
| 11 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 12 | The build lock up issue is reported here: |
| 13 | https://bugs.python.org/issue45945 |
| 14 | |
| 15 | The repro failures are documented here: |
| 16 | https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20211130-yr_o1a8d/packages/diff-html/ |
| 17 | |
| 18 | Upstream-Status: Inappropriate [see issues above] |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 20 | |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 21 | --- |
| 22 | Makefile.pre.in | 12 ++++++------ |
| 23 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 24 | |
| 25 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 26 | index edd70d4..5e13ba2 100644 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 27 | --- a/Makefile.pre.in |
| 28 | +++ b/Makefile.pre.in |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 29 | @@ -1601,30 +1601,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 30 | fi |
| 31 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 32 | $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 33 | - -j0 -d $(LIBDEST) -f \ |
| 34 | + -d $(LIBDEST) -f \ |
| 35 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 36 | $(DESTDIR)$(LIBDEST) |
| 37 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 38 | $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 39 | - -j0 -d $(LIBDEST) -f \ |
| 40 | + -d $(LIBDEST) -f \ |
| 41 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 42 | $(DESTDIR)$(LIBDEST) |
| 43 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 44 | $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 45 | - -j0 -d $(LIBDEST) -f \ |
| 46 | + -d $(LIBDEST) -f \ |
| 47 | -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ |
| 48 | $(DESTDIR)$(LIBDEST) |
| 49 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 50 | $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 51 | - -j0 -d $(LIBDEST)/site-packages -f \ |
| 52 | + -d $(LIBDEST)/site-packages -f \ |
| 53 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 54 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 55 | $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 56 | - -j0 -d $(LIBDEST)/site-packages -f \ |
| 57 | + -d $(LIBDEST)/site-packages -f \ |
| 58 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 59 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 60 | $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ |
| 61 | - -j0 -d $(LIBDEST)/site-packages -f \ |
| 62 | + -d $(LIBDEST)/site-packages -f \ |
| 63 | -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages |
| 64 | -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ |
| 65 | $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt |