diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-08-12 17:57:57 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-08-12 17:57:57 +0900 |
| commit | 3718c044c41eac4f3aa1af88cf0bb50797b4fcfa (patch) | |
| tree | d1a010c5d4c484e14c4019844a656cc2df6f50d2 | |
| parent | 07e92db918b50c2dec97afade59ea30df14c8ef1 (diff) | |
internal/rosa/package/qemu: use system meson
This also enables meson colour and fixes test suite invocation.
Signed-off-by: Ophestra <cat@gensokyo.uk>
| -rw-r--r-- | internal/rosa/package/qemu/meson-colour.patch | 13 | ||||
| -rw-r--r-- | internal/rosa/package/qemu/package.az | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/internal/rosa/package/qemu/meson-colour.patch b/internal/rosa/package/qemu/meson-colour.patch new file mode 100644 index 00000000..411c6b14 --- /dev/null +++ b/internal/rosa/package/qemu/meson-colour.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 6ddfe4b534..1cba33d562 100755 +--- a/configure ++++ b/configure +@@ -1946,7 +1946,7 @@ if test "$skip_meson" = no; then + test -n "$gdb_bin" && meson_option_add "-Dgdb=$gdb_bin" + + run_meson() { +- NINJA=$ninja $meson setup "$@" "$PWD" "$source_path" ++ NINJA=$ninja CLICOLOR_FORCE=1 $meson setup "$@" "$PWD" "$source_path" + } + eval run_meson $meson_options + if test "$?" -ne 0 ; then diff --git a/internal/rosa/package/qemu/package.az b/internal/rosa/package/qemu/package.az index 9607e780..4690fa89 100644 --- a/internal/rosa/package/qemu/package.az +++ b/internal/rosa/package/qemu/package.az @@ -10,6 +10,8 @@ package qemu { compress = bzip2; }; patches = [ + "meson-colour.patch", + "disable-mcast-test.patch", // fails with ipv6 disabled "disable-netdev-socket.patch", @@ -56,14 +58,15 @@ EOF check = [ "TIMEOUT_MULTIPLIER=5", + "check", ]; }; inputs = [ bash, - python, python-setuptools, python-wheel, + meson, ninja, pkgconf, diffutils, |