From aa285d230942873674473944b6ebef321e853275 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 20 Nov 2026 03:53:29 +0900 Subject: internal/rosa/package: fix cross-compilation These packages are part of the specialised Rosa OS system image for VM integration testing. Signed-off-by: Ophestra --- internal/rosa/package/basu.az | 8 +++++++- internal/rosa/package/dbus.az | 20 ++++++++++++++------ internal/rosa/package/foot.az | 5 ++++- internal/rosa/package/mako.az | 2 ++ internal/rosa/package/pipewire.az | 6 ++++++ internal/rosa/package/pulseaudio.az | 3 ++- internal/rosa/package/shared-mime-info/package.az | 3 +++ internal/rosa/package/utf8proc.az | 6 ++++++ 8 files changed, 44 insertions(+), 9 deletions(-) diff --git a/internal/rosa/package/basu.az b/internal/rosa/package/basu.az index cbd2dc03..2ef78b06 100644 --- a/internal/rosa/package/basu.az +++ b/internal/rosa/package/basu.az @@ -10,7 +10,13 @@ package basu { compress = gzip; }; - exec = meson {}; + exec = meson { + test = arch { + default = unset; + // takes forever under qemu + cross = false; + }; + }; tools = [ awk, diff --git a/internal/rosa/package/dbus.az b/internal/rosa/package/dbus.az index d5a38c8f..47c5890e 100644 --- a/internal/rosa/package/dbus.az +++ b/internal/rosa/package/dbus.az @@ -23,6 +23,12 @@ package dbus { "inotify": "enabled"; "x11_autolaunch": "disabled"; }; + + test = arch { + default = unset; + // attempts to invoke shell scripts through qemu + cross = false; + }; }; inputs = [ @@ -47,12 +53,14 @@ package xdg-dbus-proxy { setup = { "man": "disabled"; }; - }; - inputs = [ - dbus, - glib, - ]; + test = arch { + default = unset; + // attempts to run proxy binary as a shell script + cross = false; + }; + }; - runtime = [ glib ]; + tools = [ dbus ]; + inputs = [ glib ]; } diff --git a/internal/rosa/package/foot.az b/internal/rosa/package/foot.az index 90d3cbe3..ffc21ab3 100644 --- a/internal/rosa/package/foot.az +++ b/internal/rosa/package/foot.az @@ -13,7 +13,10 @@ package foot { exec = meson {}; - tools = [ ncurses ]; + tools = [ + ncurses, + wayland, + ]; inputs = [ xkbcommon, diff --git a/internal/rosa/package/mako.az b/internal/rosa/package/mako.az index 488ae745..394af85e 100644 --- a/internal/rosa/package/mako.az +++ b/internal/rosa/package/mako.az @@ -16,6 +16,8 @@ package mako { }; }; + tools = [ wayland ]; + inputs = [ basu, pango, diff --git a/internal/rosa/package/pipewire.az b/internal/rosa/package/pipewire.az index 53c8749c..b68b4cea 100644 --- a/internal/rosa/package/pipewire.az +++ b/internal/rosa/package/pipewire.az @@ -23,6 +23,12 @@ package wireplumber { "elogind": "disabled"; "systemd": "disabled"; }; + + test = arch { + default = unset; + // tests fail under qemu + cross = false; + }; }; inputs = [ diff --git a/internal/rosa/package/pulseaudio.az b/internal/rosa/package/pulseaudio.az index 2d882cfd..04de1da0 100644 --- a/internal/rosa/package/pulseaudio.az +++ b/internal/rosa/package/pulseaudio.az @@ -18,6 +18,8 @@ echo '`+version+`' > .tarball-version exec = meson { setup = { + "c_link_args": "-Wl,--undefined-version"; + "daemon": "false"; "client": "true"; "doxygen": "false"; @@ -28,7 +30,6 @@ echo '`+version+`' > .tarball-version tools = [ m4, coreutils, - binutils, ]; inputs = [ diff --git a/internal/rosa/package/shared-mime-info/package.az b/internal/rosa/package/shared-mime-info/package.az index 5c459bdd..84f0aad8 100644 --- a/internal/rosa/package/shared-mime-info/package.az +++ b/internal/rosa/package/shared-mime-info/package.az @@ -44,6 +44,7 @@ cp -r ../extra/xdgmime subprojects/ inputs = [ glib, + libxml2, error-standalone, ]; @@ -53,4 +54,6 @@ cp -r ../extra/xdgmime subprojects/ gettext, libxml2, ]; + + native = [ shared-mime-info ]; } diff --git a/internal/rosa/package/utf8proc.az b/internal/rosa/package/utf8proc.az index a881c493..36e1d16a 100644 --- a/internal/rosa/package/utf8proc.az +++ b/internal/rosa/package/utf8proc.az @@ -14,5 +14,11 @@ package utf8proc { cache = { "UTF8PROC_ENABLE_TESTING": "ON"; }; + + test = arch { + default = unset; + // attempts to invoke binaries directly + cross = nil; + }; }; } -- cgit v1.3.1