Skip to content
This repository was archived by the owner on Oct 8, 2024. It is now read-only.

Commit 187fef6

Browse files
authored
Merge pull request #364 from radarhere/xmlto
2 parents 2dac23e + 21a17d0 commit 187fef6

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

.github/workflows/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
44
# libxdmcp causes an issue on macOS < 11
55
# curl from brew requires zstd, use system curl
66
# if php is installed, brew tries to reinstall these after installing openblas
7-
# remove lcms2 to fix building openjpeg on arm64
8-
# remove xmlto to skip building giflib docs
9-
brew remove --ignore-dependencies webp zstd xz libtiff libxcb libxdmcp curl php lcms2 xmlto ghostscript
7+
# remove lcms2 and libpng to fix building openjpeg on arm64
8+
brew remove --ignore-dependencies webp zstd xz libpng libtiff libxcb libxdmcp curl php lcms2 ghostscript
109

1110
if [[ "$PLAT" == "arm64" ]]; then
1211
export MACOSX_DEPLOYMENT_TARGET="11.0"

config.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ function pre_build {
8787
rm /usr/local/lib/libjpeg.dylib
8888
fi
8989
build_tiff
90-
if [ -n "$IS_MACOS" ]; then
91-
# Remove existing libpng
92-
rm /usr/local/lib/libpng*
93-
fi
9490
build_libpng
9591
build_lcms2
9692
build_openjpeg

0 commit comments

Comments
 (0)