Browse Source

Merge pull request #8565 from ThomasWaldmann/pkgconf

macos: fix broken brew pkg-config -> pkgconf transition
TW 6 months ago
parent
commit
4c1e2bc4b0
3 changed files with 5 additions and 3 deletions
  1. 3 1
      .github/workflows/ci.yml
  2. 1 1
      Brewfile
  3. 1 1
      Vagrantfile

+ 3 - 1
.github/workflows/ci.yml

@@ -162,7 +162,9 @@ jobs:
             ${{ runner.os }}-
 
     - name: Install macOS packages
-      run: brew bundle install
+      run: |
+        brew unlink pkg-config@0.29.2 || true
+        brew bundle install
 
     - name: Install Python requirements
       run: |

+ 1 - 1
Brewfile

@@ -1,4 +1,4 @@
-brew 'pkg-config'
+brew 'pkgconf'
 brew 'zstd'
 brew 'lz4'
 brew 'xxhash'

+ 1 - 1
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: