From 8d203480b338c7504887777a8857e91708deadc7 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 20 Nov 2024 15:16:47 +0000 Subject: [PATCH 1/2] doc: migrate from pkg-config to pkgconf in macOS build docs Brew has migrated to using the later: ```bash brew info pkg-config ==> pkgconf: stable 2.3.0 (bottled), HEAD Package compiler and linker metadata toolkit https://github.com/pkgconf/pkgconf ``` --- doc/build-osx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build-osx.md b/doc/build-osx.md index c56da9df9f8..80039d9e6ab 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -48,7 +48,7 @@ See [dependencies.md](dependencies.md) for a complete overview. To install, run the following from your terminal: ``` bash -brew install cmake boost pkg-config libevent +brew install cmake boost pkgconf libevent ``` ### 4. Clone Bitcoin repository From fe3457ccfff9a022d9f183e18217422e2e1f7689 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 20 Nov 2024 15:17:22 +0000 Subject: [PATCH 2/2] ci: note that we should install pkgconf in future As pkg-config is now just redirected to the later, but changing this likely depends on the GHA image being updated first. --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a63e0131c82..337e8af00f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,8 @@ jobs: run: | # A workaround for "The `brew link` step did not complete successfully" error. brew install --quiet python@3 || brew link --overwrite python@3 - brew install --quiet coreutils ninja pkg-config gnu-getopt ccache boost libevent zeromq qt@5 qrencode + # Update to install pkgconf, once the GHA image has been updated. + brew install --quiet coreutils ninja gnu-getopt ccache boost libevent zeromq qt@5 qrencode - name: Set Ccache directory run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"