From 2e7e0834249851b2f91d608726ec2593dd418ba5 Mon Sep 17 00:00:00 2001 From: Gcenx <38226388+Gcenx@users.noreply.github.com> Date: Sat, 12 Feb 2022 15:59:54 -0500 Subject: [PATCH 1/2] macOS.yml: Update dependencies for wine-7.x --- .github/workflows/macOS.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 8a009e2a..07dae7d8 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -17,14 +17,11 @@ jobs: brew update brew install --cask xquartz brew install bison \ - faudio \ gphoto2 \ gst-plugins-base \ - jxrlib \ - little-cms2 \ mingw-w64 \ molten-vk \ - mpg123 + sdl2 - name: Add bison & krb5 to $PATH run: | From 316d085a4bcaab12b1a5513b935c4205eb576f1c Mon Sep 17 00:00:00 2001 From: Gcenx <38226388+Gcenx@users.noreply.github.com> Date: Sat, 12 Feb 2022 15:04:11 -0500 Subject: [PATCH 2/2] macOS.yml: Temp disabled parallel builds brew bumped mingw-w64 formula resource binutils to 2.38 has a regression in dlltool see https://lists.gnu.org/archive/html/bug-binutils/2022-02/msg00166.html Not building in parallel works around this problem --- .github/workflows/macOS.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 07dae7d8..90185a5b 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -61,9 +61,10 @@ jobs: --x-lib=/opt/X11/lib - name: Build wine64 + # mingw-w64 brew formula bumped binutils 2.38 causing a regression in parallel builds run: | cd $GITHUB_WORKSPACE/wine - make -j$(sysctl -n hw.ncpu 2>/dev/null) + make wine-devel: runs-on: macos-latest @@ -121,6 +122,7 @@ jobs: --x-lib=/opt/X11/lib - name: Build wine64 + # mingw-w64 brew formula bumped binutils 2.38 causing a regression in parallel builds run: | cd $GITHUB_WORKSPACE/wine - make -j$(sysctl -n hw.ncpu 2>/dev/null) + make