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

Fix libpng fails to build with awk on path #1245

Merged
merged 2 commits into from
Feb 19, 2024
Merged

Fix libpng fails to build with awk on path #1245

merged 2 commits into from
Feb 19, 2024

Conversation

danyeaw
Copy link
Member

@danyeaw danyeaw commented Feb 17, 2024

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.

@pbor
Copy link
Contributor

pbor commented Feb 18, 2024

Nice!

@pbor
Copy link
Contributor

pbor commented Feb 18, 2024

I see actually that the upstream libpng has a different fix, so I guess we wait for that?

@danyeaw danyeaw force-pushed the libpng-fix branch 2 times, most recently from 06234b1 to b1d9469 Compare February 18, 2024 20:43
@danyeaw
Copy link
Member Author

danyeaw commented Feb 18, 2024

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
Copy link
Contributor

pbor commented Feb 19, 2024

Needs a small rebase... while you do that I guess we could just squash this in two commits:

  1. the libpng update + patch
  2. remove the git hack from ci

@danyeaw
Copy link
Member Author

danyeaw commented Feb 19, 2024

@pbor Thanks, good idea!

@danyeaw danyeaw merged commit 4c16e7e into main Feb 19, 2024
11 checks passed
@danyeaw danyeaw deleted the libpng-fix branch February 19, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

libpng fails to build
2 participants