Skip to content

Commit 9cee3b1

Browse files
committed
CI mac: disable pkg-config and use pkgconf
pkgconf is more modern version and the CI on macos-14 now fails because both pkg-config and pkgconf (presumably as a dependency) are to be installed. The erroa (the beginning, additional info omittedr): ``` ==> Pouring pkgconf--2.3.0_1.arm64_sonoma.bottle.tar.gz Error: The `brew link` step did not complete successfully The formula built, but is not symlinked into /opt/homebrew Could not symlink bin/pkg-config Target /opt/homebrew/bin/pkg-config is a symlink belonging to [email protected]. You can unlink it: brew unlink [email protected] ``` Both pkgconf and pkg-config can be installed automatically as a dependency of some other packages so ensure a defined state (both installed, pkg-config disabled).
1 parent 73718be commit 9cee3b1

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

.github/scripts/macOS/prepare.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ 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
40+
fi
41+
brew unlink pkg-config
42+
3443
set -- \
3544
asciidoctor \
3645
autoconf \
@@ -46,7 +55,7 @@ set -- \
4655
molten-vk \
4756
opencv \
4857
ossp-uuid `#for cineform` \
49-
pkg-config \
58+
pkgconf \
5059
portaudio \
5160
qt \
5261
sdl2 \

0 commit comments

Comments
 (0)