NotificationsYou must be signed in to change notification settings
Fork32.1k
Star67.3k

gh-103776: Remove explicit uses of $(SHELL) from Makefile#103778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

zware merged 1 commit intopython:mainfromzware:fix_makefile_shell_use

Apr 24, 2023

Merged

gh-103776: Remove explicit uses of $(SHELL) from Makefile#103778

zware merged 1 commit intopython:mainfromzware:fix_makefile_shell_use

Apr 24, 2023

Conversation

Copy link

Member

zware commentedApr 24, 2023•
edited
Loading

This avoids conflicting with the shebang of the called scripts as well
as avoiding hard errors on platforms where the called script runs a
failing unchecked command in the usual course of checking since
SHELL=/bin/sh -e as ofa90863c.

Fixesgh-103776.

pythongh-103776: Remove explicit uses of $(SHELL) from Makefile

6a27c46

This avoids conflicting with the shebang of the called scripts as wellas avoiding hard errors on platforms where the called script runs afailing unchecked command in the usual course of checking since`SHELL=/bin/sh -e` as of a2944b950c52.Fixespythongh-103776.

zware added type-bug

An unexpected behavior, bug, or error

build

The build process and cross-build

3.12only security fixes labels

Apr 24, 2023

zware self-assigned this

Apr 24, 2023

bedevere-bot mentioned this pull request

Apr 24, 2023

SHELL=/bin/sh -e can cause failures whenMakefile re-runs./configure#103776

Closed

bedevere-bot added the awaiting core review label

Apr 24, 2023

zware added the skip news label

Apr 24, 2023

zwareenabled auto-merge (squash)

April 24, 2023 17:59

gpshead approved these changes

Apr 24, 2023

View reviewed changes

Copy link

Member

gpshead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I mildly wonder if these were "load bearing" uses of $(SHELL) for some environment where files don't come through executable or the #! line doesn't work? regardless, this cleanup makes sense to me and simplifies thing so if it's working on everything we can figure out, we should do it.

bedevere-bot added awaiting merge and removed awaiting core review labels

Apr 24, 2023

zware merged commited948e0 intopython:main

Apr 24, 2023

zware deleted the fix_makefile_shell_use branch

April 24, 2023 18:31

bedevere-bot removed the awaiting merge label

Apr 24, 2023

Copy link

MemberAuthor

zware commentedApr 24, 2023

I had the same concern, but there are some other uses of./config.status at

cpython/Makefile.pre.in

Lines 972 to 976 in58b6be3

	Modules/Setup.bootstrap: $(srcdir)/Modules/Setup.bootstrap.in config.status
	./config.status $@

	Modules/Setup.stdlib: $(srcdir)/Modules/Setup.stdlib.in config.status
	./config.status $@

that make me less worried about it :)

carljm added a commit to carljm/cpython that referenced this pull request

Apr 24, 2023

Merge branch 'main' into superopt

19b8025

* main: (53 commits)pythongh-102498 Clean up unused variables and imports in the email module  (python#102482)pythongh-99184: Bypass instance attribute access in `repr` of `weakref.ref` (python#99244)pythongh-99032: datetime docs: Encoding is no longer relevant (python#93365)pythongh-94300: Update datetime.strptime documentation (python#95318)pythongh-103776: Remove explicit uses of $(SHELL) from Makefile (pythonGH-103778)pythongh-87092: fix a few cases of incorrect error handling in compiler (python#103456)pythonGH-103727: Avoid advancing tokenizer too far in f-string mode (pythonGH-103775)  Revert "Add tests for empty range equality (python#103751)" (python#103770)pythongh-94518: Port 23-argument `_posixsubprocess.fork_exec` to Argument Clinic (python#94519)pythonGH-65022: Fix description of copyreg.pickle function (python#102656)pythongh-103323: Get the "Current" Thread State from a Thread-Local Variable (pythongh-103324)pythongh-91687: modernize dataclass example typing (python#103773)pythongh-103746: Test `types.UnionType` and `Literal` types together (python#103747)pythongh-103765: Fix 'Warning: py:class reference target not found: ModuleSpec' (pythonGH-103769)pythongh-87452: Improve the Popen.returncode docs  Removed unnecessary escaping of asterisks (python#103714)pythonGH-102973: Slim down Fedora packages in the dev container (python#103283)pythongh-103091: Add PyUnstable_Type_AssignVersionTag (python#103095)  Add tests for empty range equality (python#103751)pythongh-103712: Increase the length of the type name in AttributeError messages (python#103713)  ...

carljm added a commit to carljm/cpython that referenced this pull request

Apr 24, 2023

Merge branch 'superopt' into superopt_spec

1972ca4

* superopt: (82 commits)pythongh-101517: fix line number propagation in code generated for except* (python#103550)pythongh-103780: Use patch instead of mock in asyncio unix events test (python#103782)pythongh-102498 Clean up unused variables and imports in the email module  (python#102482)pythongh-99184: Bypass instance attribute access in `repr` of `weakref.ref` (python#99244)pythongh-99032: datetime docs: Encoding is no longer relevant (python#93365)pythongh-94300: Update datetime.strptime documentation (python#95318)pythongh-103776: Remove explicit uses of $(SHELL) from Makefile (pythonGH-103778)pythongh-87092: fix a few cases of incorrect error handling in compiler (python#103456)pythonGH-103727: Avoid advancing tokenizer too far in f-string mode (pythonGH-103775)  Revert "Add tests for empty range equality (python#103751)" (python#103770)pythongh-94518: Port 23-argument `_posixsubprocess.fork_exec` to Argument Clinic (python#94519)pythonGH-65022: Fix description of copyreg.pickle function (python#102656)pythongh-103323: Get the "Current" Thread State from a Thread-Local Variable (pythongh-103324)pythongh-91687: modernize dataclass example typing (python#103773)pythongh-103746: Test `types.UnionType` and `Literal` types together (python#103747)pythongh-103765: Fix 'Warning: py:class reference target not found: ModuleSpec' (pythonGH-103769)pythongh-87452: Improve the Popen.returncode docs  Removed unnecessary escaping of asterisks (python#103714)pythonGH-102973: Slim down Fedora packages in the dev container (python#103283)pythongh-103091: Add PyUnstable_Type_AssignVersionTag (python#103095)  ...