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.

Sign up for GitHub

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

Jump to bottom

Correct mbedtls-cmake-findpy.patch whitespace. #39279

Merged
merged 1 commit into from
Jan 23, 2021
Merged

Correct mbedtls-cmake-findpy.patch whitespace. #39279

merged 1 commit into from
Jan 23, 2021

Conversation

Sacha0
Copy link
Member

@Sacha0 Sacha0 commented Jan 16, 2021 

mbedtls-cmake-findpy.patch lacks some whitespace that exists in
the target file, which causes patch application failure when the
patch tool is strict about whitespace. This teensy diff makes
the patch's whitespace strictly match that in the target file.

Best! :)

@Sacha0
Correct mbedtls-cmake-findpy.patch whitespace.
6416a3e 
mbedtls-cmake-findpy.patch lacks some whitespace that exists in
the target file, which causes patch application failure when the
patch tool is strict about whitespace. This teensy diff makes
the patch's whitespace strictly match that in the target file.
@Sacha0 Sacha0 added building Build system, or building Julia or its dependencies backport 1.6 Change should be backported to release-1.6 labels Jan 16, 2021
@Sacha0
Copy link
Member Author

Sacha0 commented Jan 17, 2021

Interestingly, strict applications seem to succeed with this change on master, but not when backported to release-1.6. That bizarre combination of observations suggests that I'm doing something incorrect or misunderstanding something, either here or in the builds at issue elsewhere 🤔.

@KristofferC KristofferC mentioned this pull request Jan 19, 2021
Merged
60 tasks
@Sacha0
Copy link
Member Author

Sacha0 commented Jan 20, 2021

Mystery solved: This patch does the trick on master, and 1.6 needs both this patch and #39131. So this pull request should be good to go :).

@Sacha0 Sacha0 mentioned this pull request Jan 20, 2021
Closed
@Sacha0
Copy link
Member Author

Sacha0 commented Jan 22, 2021

Absent objections I plan to merge this tomorrow. Best! :)

@Sacha0 Sacha0 merged commit 69d2453 into master Jan 23, 2021
@Sacha0 Sacha0 deleted the unhappy-whitespace branch January 23, 2021 19:50
@KristofferC KristofferC removed the backport 1.6 Change should be backported to release-1.6 label Feb 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
building Build system, or building Julia or its dependencies
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Sacha0 @KristofferC