Fix macOS CI job #894
Fix macOS CI job #894
Conversation
As can be seen from the pkg-config output, libpng apparently no longer lives in /usr/local but rather in /opt/homebrew. We apply a hard-coded quick fix.
| @@ -58,14 +58,14 @@ jobs: | |||
| pkg-config --libs libpng | |||
| pkg-config --libs --cflags libpng16 | |||
There was a problem hiding this comment.
should prob delete --libs here since we already use that on the next line
There was a problem hiding this comment.
That is "debug" output, and should probably removed at some point.
There was a problem hiding this comment.
it's helpful for troubleshooting this sort of thing :)
|
Oh, I was the last person to touch this file ... in December, 2023. |
Only if we used pkg-config for CMake configuration, but we don't (like for many other packages as well): Lines 127 to 130 in c2867fd |
| ${{github.workspace}}/.github/scripts/removemono.sh | ||
|
|
||
| - name: Configure CMake | ||
| run: cmake -DENABLE_PNG=1 -DENABLE_FREETYPE=1 -DENABLE_JPEG=1 -DENABLE_WEBP=1 | ||
| -DENABLE_TIFF=1 -DENABLE_GD_FORMATS=1 -DENABLE_CPP=0 -DENABLE_HEIF=1 -D CMAKE_PREFIX_PATH=/usr/local | ||
| -DBUILD_TEST=1 -DVERBOSE_MAKEFILE=1 -DPNG_PNG_INCLUDE_DIR=/usr/local/Cellar/libpng/${{ env.LIBPNG_VERSION }}/include -DPNG_PNG_LIBRARY_DIR=/usr/local/Cellar/libpng/${{ env.LIBPNG_VERSION }}/lib -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} | ||
| -DBUILD_TEST=1 -DVERBOSE_MAKEFILE=1 -DPNG_PNG_INCLUDE_DIR=/opt/homebrew/Cellar/libpng/${{ env.LIBPNG_VERSION }}/include -DPNG_PNG_LIBRARY_DIR=/usr/local/Cellar/libpng/${{ env.LIBPNG_VERSION }}/lib -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} |
There was a problem hiding this comment.
There is still -DPNG_PNG_LIBRARY_DIR=/usr/local/Cellar/libpng/${{ env.LIBPNG_VERSION }}/lib here.
There was a problem hiding this comment.
Indeed, but that doesn't seem to matter: https://github.com/libgd/libgd/actions/runs/12518290911/job/34920495485#step:5:52
Should probably still be cleaned up, but I'm bad at macOS. Feel free to provide a PR! :)
As can be seen from the pkg-config output, libpng apparently no longer lives in /usr/local but rather in /opt/homebrew. We apply a hard-coded quick fix.