From 94d5d97e6e267dc14ea236b4806c2e32678cf186 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 7 Jun 2023 14:59:56 +0800 Subject: [PATCH] [3.11] gh-104692: Include commoninstall as a prerequisite for bininstall (GH-104693) This ensures that `commoninstall` is completed before `bininstall` is started when parallel builds are used (`make -j install`), and so the `python3` symlink is only installed after all standard library modules are installed. Co-authored-by: Zachary Ware . (cherry picked from commit 990cb3676c2edb7e5787372d6cbe360a73367f4c) Co-authored-by: Jeffery To --- Makefile.pre.in | 6 +++++- .../Build/2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Build/2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst diff --git a/Makefile.pre.in b/Makefile.pre.in index 3ea8653de00693..3948184ad8ea3d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1839,7 +1839,11 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ fi -bininstall: altbininstall +# We depend on commoninstall here to make sure the installation is already usable +# before we possibly overwrite the global 'python3' symlink to avoid causing +# problems for anything else trying to run 'python3' while we install, particularly +# if we're installing in parallel with -j. +bininstall: commoninstall altbininstall if test ! -d $(DESTDIR)$(LIBPC); then \ echo "Creating directory $(LIBPC)"; \ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ diff --git a/Misc/NEWS.d/next/Build/2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst b/Misc/NEWS.d/next/Build/2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst new file mode 100644 index 00000000000000..2936990999e1aa --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst @@ -0,0 +1,6 @@ +Include ``commoninstall`` as a prerequisite for ``bininstall`` + +This ensures that ``commoninstall`` is completed before ``bininstall`` +is started when parallel builds are used (``make -j install``), and so +the ``python3`` symlink is only installed after all standard library +modules are installed.