From ad5bc578e7dee136b2e541622d939dd286329263 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 17 Aug 2026 18:48:35 +0100
Subject: [PATCH] Makefile + workflow: -Pcross profile, drop arm64 libs install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For the arm64 cross-build:
- dotnet publish --runtime linux-arm64 cross-compiles natively on
  amd64, no arm64 toolchain required.
- dpkg-buildpackage now runs with -Pcross (cross-build profile),
  which tells debhelper to skip arch-specific helper tools that
  aren't available on the host (e.g. aarch64-linux-gnu-objdump
  used by dh_makeshlibs).
- -d (--no-check-builddeps) skips the build-deps check for arm64
  because dotnet-sdk-10.0:arm64 isn't installed and we don't
  need it — the dotnet publish runs on the host, not on the
  target.

The workflow no longer installs libc6:arm64 etc. via multi-arch
— it was a workaround for dpkg-shlibdeps that we no longer need
once -Pcross handles the cross-build profile correctly.
---
 .forgejo/workflows/release.yml | 38 ++++++++++------------------------
 Makefile                       |  2 +-
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index 48f5cde..8c1ee26 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -77,33 +77,17 @@ jobs:
           apt-get install -y --no-install-recommends \
               build-essential debhelper imagemagick librsvg2-bin \
               ca-certificates
-          # dpkg-shlibdeps at arm64 build time needs the arm64
-          # shlibs (libc6, libstdc++6, libdl, libm, libpthread,
-          # libfontconfig, libgtk-3, etc.) to be present on the
-          # host. We add arm64 as a foreign architecture and pull
-          # them in. --no-install-recommends keeps the install
-          # surface minimal.
-          set -e
-          dpkg --add-architecture arm64 || { echo "::error::dpkg --add-architecture arm64 failed"; exit 1; }
-          apt-get update
-          # Verify each arm64 package is actually installable. Bail
-          # early with a clear message if any are missing from the
-          # configured apt sources — silent apt-get install
-          # failures are the worst kind of workflow bug.
-          for pkg in libc6:arm64 libstdc++6:arm64 \
-                     libfontconfig1:arm64 libfreetype6:arm64 \
-                     libgtk-3-0:arm64; do
-            if ! apt-cache show "$pkg" >/dev/null 2>&1; then
-              echo "::error::arm64 package '$pkg' is not available in apt sources"
-              exit 1
-            fi
-          done
-          apt-get install -y --no-install-recommends \
-              libc6:arm64 libstdc++6:arm64 \
-              libfontconfig1:arm64 libfreetype6:arm64 \
-              libgtk-3-0:arm64 || { echo "::error::Failed to install arm64 shlibs"; exit 1; }
-          # Sanity-check: the libs must be visible to dpkg-shlibdeps.
-          dpkg -l libc6:arm64 libstdc++6:arm64 | tail -3
+          # No arm64 shlibs install needed: \`dotnet publish
+          # --runtime linux-arm64\` cross-compiles natively on amd64
+          # (no arm64 toolchain required), and dpkg-buildpackage
+          # is invoked with -Pcross so debhelper skips the
+          # arch-specific helper tools (aarch64-linux-gnu-objdump
+          # for dh_makeshlibs, etc.) that aren't available on the
+          # host. dh_shlibdeps works without arm64 libs because
+          # we don't ship arm64 build dependencies in debian/control
+          # (the dotnet-sdk-10.0 there is only meaningful for amd64
+          # native builds; dpkg-buildpackage -d skips that check
+          # for arm64 cross).
           rm -rf /var/lib/apt/lists/*
           : > "$STATE_FILE"
 
diff --git a/Makefile b/Makefile
index 40d24ba..18c57d1 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ deb:
 	# would normally export (host arch, build arch, host GNU
 	# type, build GNU type) so debhelper rules see a consistent
 	# cross-build environment.
-	DPKG_HOST=$$(case "$(POSTIT_RUNTIME)" in linux-arm64) echo arm64 ;; linux-x64) echo amd64 ;; *) echo "unsupported POSTIT_RUNTIME=$(POSTIT_RUNTIME)" >&2; exit 1 ;; esac) && DEB_HOST_ARCH=$$DPKG_HOST DEB_BUILD_ARCH=amd64 DEB_HOST_GNU_TYPE=aarch64-linux-gnu DEB_BUILD_GNU_TYPE=x86_64-linux-gnu POSTIT_GIT_URL=$(POSTIT_GIT_URL) POSTIT_GIT_TAG=$(POSTIT_GIT_TAG) POSTIT_RUNTIME=$(POSTIT_RUNTIME) dpkg-buildpackage -us -uc -b -d -a$$DPKG_HOST
+	DPKG_HOST=$$(case "$(POSTIT_RUNTIME)" in linux-arm64) echo arm64 ;; linux-x64) echo amd64 ;; *) echo "unsupported POSTIT_RUNTIME=$(POSTIT_RUNTIME)" >&2; exit 1 ;; esac) && DEB_HOST_ARCH=$$DPKG_HOST DEB_BUILD_ARCH=amd64 DEB_HOST_GNU_TYPE=aarch64-linux-gnu DEB_BUILD_GNU_TYPE=x86_64-linux-gnu POSTIT_GIT_URL=$(POSTIT_GIT_URL) POSTIT_GIT_TAG=$(POSTIT_GIT_TAG) POSTIT_RUNTIME=$(POSTIT_RUNTIME) dpkg-buildpackage -us -uc -b -d -Pcross -a$$DPKG_HOST
 	# dpkg-buildpackage already writes the produced .deb to
 	# /src/_src/../ = $POSTIT_OUT_DIR (its default — there's no
 	# flag to change it). So no 'mv' is needed. The old 'mv'