From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 5 Jul 2023 10:51:16 +0000 (+0800)
Subject: [3.12] gh-104692: Include commoninstall as a prerequisite for bininstall (GH-104693... 
X-Git-Tag: v3.12.0b4~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2edec6ad9f6cbce217427e2352e577a7a83cd774;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-104692: Include commoninstall as a prerequisite for bininstall (GH-104693) (#105428)

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.

(cherry picked from commit 990cb3676c2edb7e5787372d6cbe360a73367f4c)
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e2adc3cb49f2..12788d11d1d1 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2014,7 +2014,11 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
 	fi
 
 .PHONY: bininstall
-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 000000000000..2936990999e1
--- /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.