From: Anton Mitrofanov Date: Thu, 1 Sep 2022 20:17:40 +0000 (+0300) Subject: CI: Fix vlc-contrib linking on macOS X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bdd8b8993187b8c6ccf48d315544584f35b8fee;p=libx264 CI: Fix vlc-contrib linking on macOS Use pkg-config from the custom PATH. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05f0dde5..b5d4d945 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,7 @@ stages: _CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-x86_64/" _XCFLAGS: "-arch x86_64" _XLDFLAGS: "-arch x86_64" + _BIN_PATH: /Users/videolanci/sandbox/bin .variables-macos-arm64: &variables-macos-arm64 _TRIPLET: "aarch64-apple-darwin19" @@ -50,6 +51,7 @@ stages: _CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-arm64/" _XCFLAGS: "-arch arm64" _XLDFLAGS: "-arch arm64" + _BIN_PATH: /Users/videolanci/sandbox/bin .build: stage: build @@ -147,6 +149,7 @@ build-llvm-mingw-aarch64: extends: .build script: | set -x + export PATH="${_BIN_PATH}:$PATH" LOCAL_INSTALL_DIR=`pwd`/${_TRIPLET} export PKG_CONFIG_LIBDIR=${LOCAL_INSTALL_DIR}/lib/pkgconfig curl -f -o vlc-contrib.txt ${_CONTRIB_URL}