internal/rosa/package/qemu: use system meson
Test / Hakurei (race detector) (push) Successful in 6m56s
Test / Sandbox (push) Successful in 3m1s
Test / Sandbox (race detector) (push) Successful in 5m44s
Test / ShareFS (push) Successful in 7m23s
Test / Create distribution (push) Successful in 53s
Test / Hakurei (push) Successful in 3m27s
Test / Flake checks (push) Successful in 1m18s
Test / Hakurei (race detector) (push) Successful in 6m56s
Test / Sandbox (push) Successful in 3m1s
Test / Sandbox (race detector) (push) Successful in 5m44s
Test / ShareFS (push) Successful in 7m23s
Test / Create distribution (push) Successful in 53s
Test / Hakurei (push) Successful in 3m27s
Test / Flake checks (push) Successful in 1m18s
This also enables meson colour and fixes test suite invocation. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -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
|
||||||
@@ -10,6 +10,8 @@ package qemu {
|
|||||||
compress = bzip2;
|
compress = bzip2;
|
||||||
};
|
};
|
||||||
patches = [
|
patches = [
|
||||||
|
"meson-colour.patch",
|
||||||
|
|
||||||
"disable-mcast-test.patch",
|
"disable-mcast-test.patch",
|
||||||
// fails with ipv6 disabled
|
// fails with ipv6 disabled
|
||||||
"disable-netdev-socket.patch",
|
"disable-netdev-socket.patch",
|
||||||
@@ -56,14 +58,15 @@ EOF
|
|||||||
|
|
||||||
check = [
|
check = [
|
||||||
"TIMEOUT_MULTIPLIER=5",
|
"TIMEOUT_MULTIPLIER=5",
|
||||||
|
"check",
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
inputs = [
|
inputs = [
|
||||||
bash,
|
bash,
|
||||||
python,
|
|
||||||
python-setuptools,
|
python-setuptools,
|
||||||
python-wheel,
|
python-wheel,
|
||||||
|
meson,
|
||||||
ninja,
|
ninja,
|
||||||
pkgconf,
|
pkgconf,
|
||||||
diffutils,
|
diffutils,
|
||||||
|
|||||||
Reference in New Issue
Block a user