From d5cac5facb071125262de438501286ea26e7d0e1 Mon Sep 17 00:00:00 2001 From: Dave Vasilevsky Date: Thu, 21 Nov 2024 22:51:00 -0500 Subject: [PATCH] switch to pkgconf for ci --- .github/workflows/ci.yml | 8 ++++++-- autogen.sh | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f5272ba..24494771 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - name: apt dependencies run: > sudo apt-get update && - sudo apt-get install -y automake autoconf libtool pkg-config + sudo apt-get install -y automake autoconf libtool pkgconf zlib1g-dev liblzo2-dev liblzma-dev liblz4-dev libzstd-dev fio if: runner.os == 'Linux' @@ -46,8 +46,12 @@ jobs: env: HOMEBREW_NO_AUTO_UPDATE: 1 run: | - brew install autoconf automake libtool pkgconfig squashfs coreutils + brew list + brew remove pkgconfig + brew install autoconf automake libtool pkgconf squashfs coreutils brew install --cask macfuse + brew list pkgconf + ls -l /opt/homebrew/bin/pkg* if: runner.os == 'macOS' - name: configure run: | diff --git a/autogen.sh b/autogen.sh index 76c675b2..2bda8756 100755 --- a/autogen.sh +++ b/autogen.sh @@ -17,9 +17,11 @@ if libtoolize --version > /dev/null 2>&1; then : ; else fi fi -if pkg-config --version > /dev/null 2>&1; then : ; else - echo "Missing pkg-config" - exit 1 +if pkgconf --version > /dev/null 2>&1; then : ; else + if pkg-config --version > /dev/null 2>&1; then : ; else + echo "Missing pkg-config" + exit 1 + fi fi exec autoreconf -i