Skip to content

Commit 49b6a47

Browse files
committed
CI mac: pkgconf/pkg-config problem fix
THe problem seems to be that there is preinstalled pkg-config is CI but the version that is being to be installed is alias for pkgconf.
1 parent 9cee3b1 commit 49b6a47

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/scripts/macOS/prepare.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,9 @@ echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" >> "$GITHUB_ENV"
3131
echo "/usr/local/opt/qt/bin" >> "$GITHUB_PATH"
3232
echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> "$GITHUB_ENV"
3333

34-
# Ensure that pkg-config is installed but unlinked.
35-
# This is to prevent interference with pkgconf - both can be installed as
36-
# a dependency of other packages so ensure a defined state (both installed;
37-
# pkgconf installed and enabled later).
38-
if ! brew list pkg-config 2>/dev/null; then
39-
brew install pkg-config
34+
if ! brew list pkgconf 2>/dev/null && ! brew list pkg-config 2>/dev/null; then
35+
brew install pkgconf
4036
fi
41-
brew unlink pkg-config
4237

4338
set -- \
4439
asciidoctor \
@@ -55,7 +50,6 @@ set -- \
5550
molten-vk \
5651
opencv \
5752
ossp-uuid `#for cineform` \
58-
pkgconf \
5953
portaudio \
6054
qt \
6155
sdl2 \

0 commit comments

Comments
 (0)