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 \