From e58ab9e06984305abc30c83ff9043579b16267f0 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 15 May 2024 09:19:10 -0700
Subject: [PATCH] systemd/mutter,gnome-shell: disable crossdirect (MR 5115)
Workaround since building for armv7 on x86_64 fails, see
https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5115#note_1899890119
[ci:skip-vercheck]
[ci:skip-build] already built successfully in CI
---
extra-repos/systemd/gnome-shell/APKBUILD | 4 +++-
extra-repos/systemd/mutter/APKBUILD | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/extra-repos/systemd/gnome-shell/APKBUILD b/extra-repos/systemd/gnome-shell/APKBUILD
index 2bfd4a50a4c..1ca261d6489 100644
--- a/extra-repos/systemd/gnome-shell/APKBUILD
+++ b/extra-repos/systemd/gnome-shell/APKBUILD
@@ -74,7 +74,9 @@ subpackages="
source="https://download.gnome.org/sources/gnome-shell/${_pkgver%.*}/gnome-shell-$_pkgver.tar.xz
gsh.patch
"
-options="!check" # Tests have circular dependency 'gnome-shell <-> gdm'
+# TODO: crossdirect disabled due to armv7 crosscompile failure on x86_64, see
+# https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5115#note_1899890119
+options="!check !pmb:crossdirect" # Tests have circular dependency 'gnome-shell <-> gdm'
builddir="$srcdir/$pkgname-$_pkgver"
# secfixes:
diff --git a/extra-repos/systemd/mutter/APKBUILD b/extra-repos/systemd/mutter/APKBUILD
index bb165fd2208..2418f516080 100644
--- a/extra-repos/systemd/mutter/APKBUILD
+++ b/extra-repos/systemd/mutter/APKBUILD
@@ -63,7 +63,9 @@ makedepends="
xkeyboard-config-dev
xwayland-dev
"
-options="!check" # Can't be run with release builds
+# TODO: crossdirect disabled due to armv7 crosscompile failure on x86_64, see
+# https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5115#note_1899890119
+options="!check !pmb:crossdirect" # Can't be run with release builds
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-schemas::noarch"
source="https://download.gnome.org/sources/mutter/${_pkgver%.*}/mutter-$_pkgver.tar.xz
fixudev-req.patch
--
GitLab