[3.12] gh-104692: Include commoninstall as a prerequisite for bininst… · python/cpython@2edec6a · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 74.9k

• Code
• Issues 5k+
• Pull requests 2.5k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 2edec6a

Browse filesBrowse the repository at this point in the historyBrowse files

jefferyto

authored

[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 990cb36)

1 parent 6371029 commit 2edec6a
Copy full SHA for 2edec6a

2 files changed

+11-1Lines changed: 11 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Makefile.pre.in
• Misc/NEWS.d/next/Build
  • 2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Makefile.pre.in‎

Copy file name to clipboardExpand all lines: Makefile.pre.in

+5-1Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -2014,7 +2014,11 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
2014	2014	fi
2015	2015
2016	2016	.PHONY: bininstall
2017		- bininstall: altbininstall
	2017	+ # We depend on commoninstall here to make sure the installation is already usable
	2018	+ # before we possibly overwrite the global 'python3' symlink to avoid causing
	2019	+ # problems for anything else trying to run 'python3' while we install, particularly
	2020	+ # if we're installing in parallel with -j.
	2021	+ bininstall: commoninstall altbininstall
2018	2022	if test ! -d $(DESTDIR)$(LIBPC); then \
2019	2023	echo "Creating directory $(LIBPC)"; \
2020	2024	$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \

Collapse file

‎Misc/NEWS.d/next/Build/2023-05-20-23-49-30.gh-issue-104692.s5UIu5.rst‎

Copy file name to clipboard

+6Lines changed: 6 additions & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,6 @@
	1	+ Include ``commoninstall`` as a prerequisite for ``bininstall``
	2	+
	3	+ This ensures that ``commoninstall`` is completed before ``bininstall``
	4	+ is started when parallel builds are used (``make -j install``), and so
	5	+ the ``python3`` symlink is only installed after all standard library
	6	+ modules are installed.

0 commit comments

Comments

0 (0)