From 5e345d58c447adc389f5e6ca0d9b90e7b54a3a71 Mon Sep 17 00:00:00 2001
From: Visual Ehrmanntraut
 <30368284+VisualEhrmanntraut@users.noreply.github.com>
Date: Sun, 19 Jan 2025 02:55:05 +0200
Subject: [PATCH] build: attempt to fix build workflow v6

---
 .github/workflows/build.yaml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1253f714a6..2c8b921af5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,10 +6,10 @@ on:
   pull_request:
 
 jobs:
-  build_aarch64_softmmu_linux:
+  build_linux:
     runs-on: ubuntu-latest
     steps:
-      - name: Install build dependencies
+      - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential libtool meson ninja-build pkg-config libcapstone-dev device-tree-compiler libglib2.0-dev gnutls-bin libjpeg-turbo8-dev libpng-dev libslirp-dev libssh-dev libusb-1.0-0-dev liblzo2-dev libncurses5-dev libpixman-1-dev libsnappy-dev vde2 zstd libgnutls28-dev nettle-bin libnettle8t64 nettle-dev libgmp10 libgmp3-dev lzfse liblzfse-dev
@@ -18,14 +18,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Build qemu
+      - name: Build
         run: |
           mkdir build
           cd build
           ../configure --target-list=aarch64-softmmu,x86_64-softmmu --enable-capstone --enable-slirp --enable-lzfse --enable-nettle --enable-gnutls --disable-werror
           make -j$(nproc)
 
-      - name: Install qemu
+      - name: Install
         run: |
           cd build
           make DESTDIR=$GITHUB_WORKSPACE/bin/ install
@@ -33,28 +33,27 @@ jobs:
       - name: Publish binaries
         uses: actions/upload-artifact@v4
         with:
-          name: aarch64_softmmu_linux
+          name: linux
           path: ${{ github.workspace }}/bin/
 
-  build_aarch64_softmmu_macos:
+  build_macos:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Install build dependencies
+      - name: Install dependencies
         run: |
           brew install libtool meson ninja pkgconf capstone dtc glib gnutls jpeg-turbo libpng libslirp libssh libusb lzo ncurses nettle pixman snappy vde zstd lzfse nettle
 
-      - name: Build qemu
+      - name: Build
         run: |
-          mkdir build
-          cd build
-          CFLAGS="$CFLAGS -I/opt/homebrew/include" C_INCLUDE_PATH="$C_INCLUDE_PATH:/opt/homebrew/include" LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/lib" LIBTOOL="glibtool" ../configure --target-list=aarch64-softmmu,x86_64-softmmu --disable-bsd-user --disable-guest-agent --enable-lzfse --enable-slirp --enable-capstone --enable-curses --enable-libssh --enable-virtfs --enable-zstd --extra-cflags=-DNCURSES_WIDECHAR=1 --disable-sdl --disable-gtk --enable-cocoa --enable-lzfse --enable-nettle --enable-gnutls --disable-werror
+          mkdir build && cd build
+          CFLAGS="$CFLAGS -I/opt/homebrew/include" LDFLAGS="$LDFLAGS -L/opt/homebrew/lib" LIBTOOL="glibtool" ../configure --target-list=aarch64-softmmu,x86_64-softmmu --disable-bsd-user --disable-guest-agent --enable-lzfse --enable-slirp --enable-capstone --enable-curses --enable-libssh --enable-virtfs --enable-zstd --extra-cflags=-DNCURSES_WIDECHAR=1 --disable-sdl --disable-gtk --enable-cocoa --enable-lzfse --enable-nettle --enable-gnutls --disable-werror
           make -j$(sysctl -n hw.logicalcpu)
 
-      - name: Install qemu
+      - name: Install
         run: |
           cd build
           make DESTDIR=$GITHUB_WORKSPACE/bin/ install
@@ -62,5 +61,5 @@ jobs:
       - name: Publish binaries
         uses: actions/upload-artifact@v4
         with:
-          name: aarch64_softmmu_macos
+          name: macos
           path: ${{ github.workspace }}/bin/