Fix libpng fails to build with awk on path #1245
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Feb 17, 2024
pbor
approved these changes
Feb 18, 2024
|
Nice! |
|
I see actually that the upstream libpng has a different fix, so I guess we wait for that? |
danyeaw
force-pushed
the
libpng-fix
branch
2 times, most recently
from
06234b1 to
b1d9469
Compare
|
Hi @pbor, I updated the fix to match the one they are going to use upstream. I think it would still be worth patching this while we wait for the next version to come out. |
pbor
approved these changes
Feb 19, 2024
|
Needs a small rebase... while you do that I guess we could just squash this in two commits:
|
|
@pbor Thanks, good idea! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #984.
The main change is submitted upstream here: pnggroup/libpng#547, to disable use of awk with MSVC.
It is no longer required to move the Git\bin folder out of the way to get a successful build, so I removed that from the CI.