From 2edec6ad9f6cbce217427e2352e577a7a83cd774 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 5 Jul 2023 18:51:16 +0800 Subject: [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) --- Makefile.pre.in | 6 +++++- .../next/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 e2adc3c..12788d1 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 0000000..2936990 --- /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. -- cgit v0.12