Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: Fix missing slashes #28659

Merged
merged 4 commits into from Oct 2, 2021
Merged

Conversation

native-api
Copy link
Contributor

@native-api native-api commented Sep 30, 2021

There are missing slashes in the two command lines, resulting in invocations like this:

if test "x" != "x" ; then \
		rm -f /Users/Daniel/.pyenv/versions/3.9.1/binpython3.9-32; \
		lipo  \
			-output /Users/Daniel/.pyenv/versions/3.9.1/bin/python3.9-32 \
			/Users/Daniel/.pyenv/versions/3.9.1/bin/python3.9; \
	fi

Applies to everything since 3.4.

@serhiy-storchaka
Copy link
Member

serhiy-storchaka commented Oct 1, 2021

LGTM, but please add a NEWS entry. https://blurb-it.herokuapp.com/

@native-api
Copy link
Contributor Author

native-api commented Oct 1, 2021

Done.

@native-api
Copy link
Contributor Author

native-api commented Oct 1, 2021

Done. I couldn't find anything in the devguide telling what a NEWS entry must contain so went with my best judgement.

Copy link
Member

@JulienPalard JulienPalard left a comment

LGTM, you spotted it while building on mac?

@native-api
Copy link
Contributor Author

native-api commented Oct 1, 2021

While diagnosing a Mac build of a Pyenv user. pyenv/pyenv#1678 (comment)

@JulienPalard
Copy link
Member

JulienPalard commented Oct 2, 2021

(reopening to restart failed azure pipeline)

@JulienPalard JulienPalard reopened this Oct 2, 2021
@JulienPalard JulienPalard merged commit 417faa6 into python:main Oct 2, 2021
12 checks passed
@miss-islington
Copy link
Contributor

miss-islington commented Oct 2, 2021

Thanks @native-api for the PR, and @JulienPalard for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒🤖

@bedevere-bot
Copy link

bedevere-bot commented Oct 2, 2021

GH-28690 is a backport of this pull request to the 3.10 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 2, 2021
(cherry picked from commit 417faa6)

Co-authored-by: native-api <vano@mail.mipt.ru>
@bedevere-bot
Copy link

bedevere-bot commented Oct 2, 2021

GH-28691 is a backport of this pull request to the 3.9 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 2, 2021
(cherry picked from commit 417faa6)

Co-authored-by: native-api <vano@mail.mipt.ru>
@ned-deily
Copy link
Member

ned-deily commented Oct 2, 2021

Ah, thanks for finding that. This should never be an issue in real life except in a theoretical case where you are re-using a build directory but with different configure arguments on a macOS universal build. But the original is incorrect so it's fine to fix it. I'm a bit concerned about adding a blurb entry with no associated bpo issue. The blurb utility won't let you do that and I know of no precedent for having a NEWS item in the changelog without a bpo. In this case, the change is so minor and should have no practical effect that it's definitely not worth opening an issue for it; I would prefer to see the NEWS item removed instead.

@native-api native-api deleted the macos_32_slash branch Oct 2, 2021
@native-api native-api restored the macos_32_slash branch Oct 2, 2021
@native-api
Copy link
Contributor Author

native-api commented Oct 2, 2021

I've restored the PR branch so you can push more commits there and merge it again if you need to...

@JulienPalard
Copy link
Member

JulienPalard commented Oct 3, 2021

I'm removing the news entry in #28703

@native-api native-api deleted the macos_32_slash branch Oct 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip issue type-bug An unexpected behavior, bug, or error
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants