Merge pull request #8565 from ThomasWaldmann/pkgconf

macos: fix broken brew pkg-config -> pkgconf transition
borgbackup · Nov 24, 2024 · 4c1e2bc · 4c1e2bc
2 parents b8fe10d + 41f150f
commit 4c1e2bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -162,7 +162,9 @@ jobs:
             ${{ runner.os }}-
 
     - name: Install macOS packages
-      run: brew bundle install
+      run: |
+        brew unlink [email protected] || true
+        brew bundle install
 
     - name: Install Python requirements
       run: |

diff --git a/Brewfile b/Brewfile
@@ -1,4 +1,4 @@
-brew 'pkg-config'
+brew 'pkgconf'
 brew 'zstd'
 brew 'lz4'
 brew 'xxhash'

diff --git a/Vagrantfile b/Vagrantfile
@@ -171,7 +171,7 @@ def packages_macos
 
     # now brew, curl, ca-certificates, openssl@3 should be all ok.
     brew update
-    brew install pkg-config readline xxhash zstd lz4 xz
+    brew install pkgconf readline xxhash zstd lz4 xz
     brew install --cask macfuse
     # brew upgrade  # upgrade everything (takes rather long)
     # pyenv shall use the openssl@3 from homebrew: