]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.11] gh-104692: Include commoninstall as a prerequisite for bininstall (GH-104693...
authorJeffery To <jeffery.to@gmail.com>
Wed, 5 Jul 2023 10:51:26 +0000 (18:51 +0800)
committerGitHub <noreply@github.com>
Wed, 5 Jul 2023 10:51:26 +0000 (12:51 +0200)
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)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
Makefile.pre.in
Misc/NEWS.d/next/Build/2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst [new file with mode: 0644]

index 3ea8653de00693a48622f377b965356c98c633cb..3948184ad8ea3d9c0b14cac28f3fe21c5c28d774 100644 (file)
@@ -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 (file)
index 0000000..2936990
--- /dev/null
@@ -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.