diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e33ca1..48e80ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,10 +47,14 @@ jobs: uses: actions/checkout@v6 - name: Install system dependencies run: brew install gexiv2 + - name: Work around gexiv2 versioned naming discrepance + run: ln -s /opt/homebrew/lib/pkgconfig/gexiv2-0.16.pc /opt/homebrew/lib/pkgconfig/gexiv2.pc - name: Install Rust and Cargo run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - name: Show environment info run: | + ls -AlhR /opt/homebrew/Cellar/gexiv2 + ls -AlhR /opt/homebrew/lib/pkgconfig rustc --version --verbose && echo "" cargo --version --verbose - name: Build diff --git a/SETUP.md b/SETUP.md index 6939562..7c69a4b 100644 --- a/SETUP.md +++ b/SETUP.md @@ -51,8 +51,8 @@ brew update brew install gexiv2 pkgconf ``` -For the build to succeed, you will have to tell `pkg-config` where Homebrew -installed some relevant libraries, using: +For the build to succeed, you may have to tell `pkgconf` where Homebrew +installed relevant libraries, using `PKG_CONFIG_PATH`. For example, ```shell export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig" diff --git a/build.rs b/build.rs index 81c0c1b..cdbdfaf 100644 --- a/build.rs +++ b/build.rs @@ -22,7 +22,7 @@ fn main() { .unwrap_or_else(|e| { eprintln!( "\nThe gexiv2 library was not found by pkg-config/pkgconf on your system.\n\n\ - Consult the README.md file for suggestions on how to acquire it." + Consult README.md or SETUP.md for suggestions on how to acquire it." ); panic!("{}", e); });