From b0a9fab88dcf903eda782e806859109a73e7ac0f Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 14 Nov 2026 21:17:47 +0900 Subject: internal/rosa/package/sway: fix cross-compilation This change also includes fixes for sway inputs. Signed-off-by: Ophestra --- internal/rosa/package/check.az | 6 ++++++ internal/rosa/package/fontconfig.az | 4 ++++ internal/rosa/package/fribidi.az | 6 ++++++ internal/rosa/package/json-c.az | 6 ++++++ internal/rosa/package/libevdev.az | 8 ++++---- internal/rosa/package/libinput.az | 6 ++++++ internal/rosa/package/sway/package.az | 1 + internal/rosa/package/wlroots.az | 7 +++++-- internal/rosa/package/x.az | 12 +++++++++++- internal/rosa/package/xkbcommon.az | 7 +++++++ 10 files changed, 56 insertions(+), 7 deletions(-) diff --git a/internal/rosa/package/check.az b/internal/rosa/package/check.az index 2598483f..8c068f12 100644 --- a/internal/rosa/package/check.az +++ b/internal/rosa/package/check.az @@ -14,6 +14,12 @@ package check { cache = { "CHECK_ENABLE_TIMEOUT_TESTS": "OFF"; }; + + test = arch { + default = unset; + // attempts to invoke shell scripts through qemu + cross = nil; + }; }; tools = [ coreutils ]; diff --git a/internal/rosa/package/fontconfig.az b/internal/rosa/package/fontconfig.az index ad46b158..44824f92 100644 --- a/internal/rosa/package/fontconfig.az +++ b/internal/rosa/package/fontconfig.az @@ -13,6 +13,10 @@ package fontconfig { exec = make { generate = "NOCONFIGURE=1 ./autogen.sh"; + configure = { + // configure attempts to run compiled binary + "": "ac_cv_va_copy=yes"; + }; }; tools = [ diff --git a/internal/rosa/package/fribidi.az b/internal/rosa/package/fribidi.az index eb74f401..60aee70b 100644 --- a/internal/rosa/package/fribidi.az +++ b/internal/rosa/package/fribidi.az @@ -14,5 +14,11 @@ package fribidi { setup = { "docs": "false"; }; + + test = arch { + default = unset; + // some tests bypass meson wrapper and invokes binary directly + cross = false; + }; }; } diff --git a/internal/rosa/package/json-c.az b/internal/rosa/package/json-c.az index 338d4557..5f81931b 100644 --- a/internal/rosa/package/json-c.az +++ b/internal/rosa/package/json-c.az @@ -16,5 +16,11 @@ package json-c { "ENABLE_RDRAND": "ON"; "ENABLE_THREADING": "ON"; }; + + test = arch { + default = unset; + // attempts to invoke binaries without qemu + cross = nil; + }; }; } diff --git a/internal/rosa/package/libevdev.az b/internal/rosa/package/libevdev.az index cd4cd671..56057e2c 100644 --- a/internal/rosa/package/libevdev.az +++ b/internal/rosa/package/libevdev.az @@ -17,10 +17,10 @@ package libevdev { }; }; - tools = [ + tools = [ bash ]; + + inputs = [ check, - bash, + kernel-headers, ]; - - inputs = [ kernel-headers ]; } diff --git a/internal/rosa/package/libinput.az b/internal/rosa/package/libinput.az index 3769f680..36589422 100644 --- a/internal/rosa/package/libinput.az +++ b/internal/rosa/package/libinput.az @@ -18,6 +18,12 @@ package libinput { "libwacom": "false"; "debug-gui": "false"; }; + + test = arch { + default = unset; + // some tests invoke binary from shell script + cross = false; + }; }; tools = [ diff --git a/internal/rosa/package/sway/package.az b/internal/rosa/package/sway/package.az index 20834397..c6aa886e 100644 --- a/internal/rosa/package/sway/package.az +++ b/internal/rosa/package/sway/package.az @@ -14,6 +14,7 @@ package sway { env = [ "CFLAGS=-Wno-switch" ]; exec = meson {}; + tools = [ wayland ]; inputs = [ json-c, pcre2, diff --git a/internal/rosa/package/wlroots.az b/internal/rosa/package/wlroots.az index 810d8009..d506f57d 100644 --- a/internal/rosa/package/wlroots.az +++ b/internal/rosa/package/wlroots.az @@ -21,10 +21,14 @@ package wlroots { }; }; + tools = [ + wayland, + glslang, + hwdata, + ]; inputs = [ mesa, libglvnd, - hwdata, wayland, wayland-protocols, xwayland, @@ -36,7 +40,6 @@ package wlroots { libliftoff, vulkan-headers, vulkan-loader, - glslang, kernel-headers, ]; diff --git a/internal/rosa/package/x.az b/internal/rosa/package/x.az index f70203ec..6fe4526c 100644 --- a/internal/rosa/package/x.az +++ b/internal/rosa/package/x.az @@ -498,7 +498,10 @@ package libfontenc { util-macros, ]; - inputs = [ xorgproto ]; + inputs = [ + zlib, + xorgproto, + ]; } package libxkbfile { @@ -902,11 +905,18 @@ package xwayland { "ipv6": "false"; "systemd_notify": "false"; }; + + test = arch { + default = unset; + // some tests bypass meson wrapper and invokes binary directly + cross = false; + }; }; tools = [ bash, awk, + wayland, ]; inputs = [ diff --git a/internal/rosa/package/xkbcommon.az b/internal/rosa/package/xkbcommon.az index d6eb1512..0b78055b 100644 --- a/internal/rosa/package/xkbcommon.az +++ b/internal/rosa/package/xkbcommon.az @@ -19,11 +19,18 @@ package xkbcommon { setup = { "enable-x11": "false"; }; + + test = arch { + default = unset; + // some tests bypass meson wrapper and invokes binary directly + cross = false; + }; }; tools = [ m4, bison, + wayland, ]; inputs = [ -- cgit v1.3.1