diff options
-rw-r--r-- | recipes-extended/libvirt/libvirt/0002-meson-Fix-compatibility-with-Meson-0.58.patch | 48 | ||||
-rw-r--r-- | recipes-extended/libvirt/libvirt_7.2.0.bb | 1 |
2 files changed, 49 insertions, 0 deletions
diff --git a/recipes-extended/libvirt/libvirt/0002-meson-Fix-compatibility-with-Meson-0.58.patch b/recipes-extended/libvirt/libvirt/0002-meson-Fix-compatibility-with-Meson-0.58.patch new file mode 100644 index 00000000..3201eede --- /dev/null +++ b/recipes-extended/libvirt/libvirt/0002-meson-Fix-compatibility-with-Meson-0.58.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From c607266619c5ab78ad5d4179b3ea93cfb6348391 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrea Bolognani <abologna@redhat.com> | ||
3 | Date: Mon, 3 May 2021 09:06:34 +0200 | ||
4 | Subject: [PATCH] meson: Fix compatibility with Meson 0.58 | ||
5 | |||
6 | Builds failed with | ||
7 | |||
8 | tests/meson.build:690:0: ERROR: List item must be one | ||
9 | of <class 'str'>, not <class 'list'> | ||
10 | |||
11 | before this change. | ||
12 | |||
13 | https://gitlab.com/libvirt/libvirt/-/issues/158 | ||
14 | |||
15 | Upstream-Status: Backport [https://gitlab.com/libvirt/libvirt/-/commit/c607266619c5ab78ad5d4179b3ea93cfb6348391] | ||
16 | |||
17 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
18 | Signed-off-by: Andrea Bolognani <abologna@redhat.com> | ||
19 | Reviewed-by: Peter Krempa <pkrempa@redhat.com> | ||
20 | Reviewed-by: Pavel Hrdina <phrdina@redhat.com> | ||
21 | --- | ||
22 | tests/meson.build | 8 ++++---- | ||
23 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
24 | |||
25 | diff --git a/tests/meson.build b/tests/meson.build | ||
26 | index 05c3e90195..9900983d0c 100644 | ||
27 | --- a/tests/meson.build | ||
28 | +++ b/tests/meson.build | ||
29 | @@ -687,12 +687,12 @@ foreach name : test_scripts | ||
30 | test(name, script, env: tests_env) | ||
31 | endforeach | ||
32 | |||
33 | +testenv = runutf8 | ||
34 | +testenv += 'VIR_TEST_FILE_ACCESS=1' | ||
35 | + | ||
36 | add_test_setup( | ||
37 | 'access', | ||
38 | - env: [ | ||
39 | - 'VIR_TEST_FILE_ACCESS=1', | ||
40 | - runutf8, | ||
41 | - ], | ||
42 | + env: testenv, | ||
43 | exe_wrapper: [ python3_prog, check_file_access_prog.path() ], | ||
44 | ) | ||
45 | |||
46 | -- | ||
47 | GitLab | ||
48 | |||
diff --git a/recipes-extended/libvirt/libvirt_7.2.0.bb b/recipes-extended/libvirt/libvirt_7.2.0.bb index 24748efa..b5699536 100644 --- a/recipes-extended/libvirt/libvirt_7.2.0.bb +++ b/recipes-extended/libvirt/libvirt_7.2.0.bb | |||
@@ -28,6 +28,7 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \ | |||
28 | file://dnsmasq.conf \ | 28 | file://dnsmasq.conf \ |
29 | file://hook_support.py \ | 29 | file://hook_support.py \ |
30 | file://gnutls-helper.py \ | 30 | file://gnutls-helper.py \ |
31 | file://0002-meson-Fix-compatibility-with-Meson-0.58.patch \ | ||
31 | " | 32 | " |
32 | 33 | ||
33 | SRC_URI[libvirt.md5sum] = "92044b629216e44adce63224970a54a3" | 34 | SRC_URI[libvirt.md5sum] = "92044b629216e44adce63224970a54a3" |