[x264-devel] [Git][videolan/x264][master] CI: Fix vlc-contrib linking on macOS

[Anton Mitrofanov (@BugMaster)]

Anton Mitrofanov pushed to branch master at VideoLAN / x264


Commits:
8bdd8b89 by Anton Mitrofanov at 2022-09-01T23:17:40+03:00
CI: Fix vlc-contrib linking on macOS

Use pkg-config from the custom PATH.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.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}



View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/8bdd8b8993187b8c6ccf48d315544584f35b8fee

-- 
View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/8bdd8b8993187b8c6ccf48d315544584f35b8fee
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance