From 93eae1d77f8e906b51ee7bd60f39c63bc98afb2d Mon Sep 17 00:00:00 2001 From: zhom <2717306+zhom@users.noreply.github.com> Date: Fri, 6 Jun 2025 00:57:21 +0400 Subject: [PATCH] build: set pkg-config variables for linux arm --- .github/workflows/release.yml | 5 ++++- .github/workflows/rolling-release.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bb124b..8ba4600 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,7 +107,7 @@ jobs: sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev # Install cross-compilation tools for ARM64 if [[ "${{ matrix.arch }}" == "aarch64" ]]; then - sudo apt-get install -y gcc-aarch64-linux-gnu + sudo apt-get install -y gcc-aarch64-linux-gnu pkg-config-aarch64-linux-gnu fi - name: Setup cross-compilation environment (Ubuntu ARM64 only) @@ -117,6 +117,9 @@ jobs: echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG=aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV - name: Rust cache uses: swatinem/rust-cache@v2 diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 75d86bf..cd99eba 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -93,7 +93,7 @@ jobs: sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev # Install cross-compilation tools for ARM64 if [[ "${{ matrix.arch }}" == "aarch64" ]]; then - sudo apt-get install -y gcc-aarch64-linux-gnu + sudo apt-get install -y gcc-aarch64-linux-gnu pkg-config-aarch64-linux-gnu fi - name: Setup cross-compilation environment (Ubuntu ARM64 only) @@ -103,6 +103,9 @@ jobs: echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG=aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV - name: Rust cache uses: swatinem/rust-cache@v2