From aed388ea6330f11fdc2a35b99c4dbe6c8113cef1 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 8 Sep 2025 17:51:58 -0700 Subject: [PATCH] systemd/cups: disable examples / ipptool on all archs Apparently this fails on other archs when cross compiling, not just riscv64. I hit it locally when building x86_64 on aarch64. bpo is hitting it when trying to build aarch64 on x86_64. This is kinda of a big hammer, but I think we'll be able to drop this cups fork when abuild systemd split func support is upstreamed, and bpo is currently blocked trying to build changes to support our effort to upstream that abuild patch. Part-of: --- extra-repos/systemd/cups/APKBUILD | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/extra-repos/systemd/cups/APKBUILD b/extra-repos/systemd/cups/APKBUILD index 22f2975f1..db3a63744 100644 --- a/extra-repos/systemd/cups/APKBUILD +++ b/extra-repos/systemd/cups/APKBUILD @@ -4,7 +4,7 @@ maintainer="Jane Rachinger " pkgname=cups _pkgver=2.4.12 pkgver=9999$_pkgver -pkgrel=2 +pkgrel=3 pkgdesc="The CUPS Printing System" url="https://github.com/OpenPrinting/cups/" # armhf: pmb#2618 @@ -40,16 +40,6 @@ source="$pkgname-$_pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v options="!check" builddir="$srcdir/cups-$_pkgver" -case "$CARCH" in -riscv64) - # examples (which includes ipptool) fail on this arch when building in qemu, - # with 'error relocating fakeroot' - ;; -*) - subpackages="$subpackages ipptool" - ;; -esac - # NOTE: pkgname-client MUST come after ipptool or else it'll grab # /usr/bin/ipptool first... subpackages=" @@ -60,13 +50,12 @@ subpackages=" " build() { - case "$CARCH" in - riscv64) - # examples fail on this arch when building in qemu, with: - # 'error relocating fakeroot' - sed -i 's/doc examples templates/doc templates/' configure - ;; - esac + # examples fail when building in qemu, with: + # 'error relocating fakeroot' + # Disabling for all archs since any could technically be cross compiled and some + # (aarch64) are native in CI but cross compiled under bpo. It's just simpler this way 🤷‍♂️ + sed -i 's/doc examples templates/doc templates/' configure + # pmOS: remove lto ./configure \ --build=$CBUILD \