From 71352948ea690fad005668864619dd5262cf12fe Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sun, 9 Feb 2025 14:14:27 +0100
Subject: [PATCH] set CMAKE_SYSTEM_PROCESSOR

---
 .github/scripts/build.sh    | 3 ++-
 .github/workflows/qt5_6.yml | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
index e0f5e4b1..6e212475 100755
--- a/.github/scripts/build.sh
+++ b/.github/scripts/build.sh
@@ -5,6 +5,7 @@
 [ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64"
 [ -z "${ENTRYPOINT}" ] && ENTRYPOINT=""
 [ -z "${PLATFORM}" ] && PLATFORM="x11"
+[ -z "${CMAKE_SYSTEM_PROCESSOR}" ] && CMAKE_SYSTEM_PROCESSOR=""
 
 # Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform)
 if [[ $GITHUB_REF == *"refs/tags"* ]]; then
@@ -45,7 +46,7 @@ elif [[ "$RUNNER_OS" == 'Linux' ]]; then
 		-v "${GITHUB_WORKSPACE}:/source:rw" \
 		$REGISTRY_URL:$DOCKER_TAG \
 		/bin/bash -c "mkdir -p /source/build && cd /source/build &&
-		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. || exit 2 &&
+		cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_SYSTEM_PROCESSOR} .. || exit 2 &&
 		cmake --build . --target package -- -j $(nproc) || exit 3 || : &&
 		cp /source/build/bin/h* /deploy/ 2>/dev/null || : &&
 		cp /source/build/Hyperion-* /deploy/ 2>/dev/null || : &&
diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 3faed3b8..c15a2c72 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -49,6 +49,7 @@ jobs:
           { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 2),              architecture: [ armv7, linux/arm/v7 ], platform: rpi },
           { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64  ], platform: rpi }
         ]
+        target_lookup: [{ 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' }]
         isQt5:
           - ${{ inputs.qt_version == '5' }}
         exclude:
@@ -73,10 +74,6 @@ jobs:
             fi
           echo '::endgroup::'
 
-      - name: 🛠️ Set up QEMU (Raspberry Pi only)
-        if: matrix.os.platform == 'rpi'
-        uses: docker/setup-qemu-action@v3
-
       - name: 👷 Build
         shell: bash
         run: ./.github/scripts/build.sh
@@ -84,7 +81,8 @@ jobs:
           DOCKER_IMAGE: ${{ matrix.os.distribution }}
           DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
           PLATFORM: ${{ matrix.os.platform }}
-          # ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
+          ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
+          CMAKE_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCMAKE_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
           TARGET_ARCH: ${{ matrix.os.architecture[1] }}
 
       - name: 📦 Upload