---- libvirt-8.10.0/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.10.0/meson.build 2022-06-15 21:02:52.949418900 +0200
-@@ -832,16 +832,19 @@ optional_programs = [
+--- libvirt-9.10.0/meson.build.orig 2023-12-01 16:11:26.000000000 +0100
++++ libvirt-9.10.0/meson.build 2024-04-06 08:09:14.274063626 +0200
+@@ -824,16 +824,19 @@ optional_programs = [
]
foreach name : optional_programs
endforeach
-@@ -1684,6 +1687,8 @@ if not get_option('driver_qemu').disable
+@@ -1675,6 +1678,8 @@ if not get_option('driver_qemu').disable
conf.set_quoted('QEMU_USER', qemu_user)
conf.set_quoted('QEMU_GROUP', qemu_group)
-+ qemu_bridge_path = get_option('qemu_bridge_path')
-+ if qemu_bridge_path == ''
- qemu_bridge_prog = find_program(
- 'qemu-bridge-helper',
- dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ],
-@@ -1694,8 +1699,11 @@ if not get_option('driver_qemu').disable
- else
- qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
- endif
-+ endif
- conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path)
-
-+ qemu_pr_path = get_option('qemu_pr_path')
-+ if qemu_pr_path == ''
- qemu_pr_prog = find_program(
- 'qemu-pr-helper',
- dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1706,8 +1714,11 @@ if not get_option('driver_qemu').disable
- else
- qemu_pr_path = '/usr/bin/qemu-pr-helper'
- endif
-+ endif
- conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path)
-
+ qemu_slirp_path = get_option('qemu_slirp_path')
+ if qemu_slirp_path == ''
qemu_slirp_prog = find_program(
'slirp-helper',
dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1718,8 +1729,11 @@ if not get_option('driver_qemu').disable
+@@ -1685,6 +1690,7 @@ if not get_option('driver_qemu').disable
else
qemu_slirp_path = '/usr/bin/slirp-helper'
endif
+ endif
conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path)
-
-+ qemu_dbus_daemon_path = get_option('qemu_dbus_daemon_path')
-+ if qemu_dbus_daemon_path == ''
- qemu_dbus_daemon_prog = find_program(
- 'dbus-daemon',
- dirs: [ '/usr/bin', '/usr/libexec' ],
-@@ -1730,6 +1744,7 @@ if not get_option('driver_qemu').disable
- else
- qemu_dbus_daemon_path = '/usr/bin/dbus-daemon'
- endif
-+ endif
- conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path)
endif
endif
-@@ -1809,11 +1824,29 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1764,11 +1770,29 @@ if conf.has('WITH_LIBVIRTD')
endif
if fs_enable
fs_enable = false
endif
endif
-@@ -1822,15 +1855,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1777,15 +1801,17 @@ if conf.has('WITH_LIBVIRTD')
use_storage = true
conf.set('WITH_STORAGE_FS', 1)
conf.set_quoted('SHOWMOUNT', showmount_path)
endif
endif
-@@ -1842,7 +1877,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1797,7 +1823,7 @@ if conf.has('WITH_LIBVIRTD')
error('Need glusterfs (libgfapi) for gluster storage driver')
endif
use_storage = true
conf.set('WITH_STORAGE_ISCSI', 1)
elif get_option('storage_iscsi').enabled()
-@@ -1865,11 +1900,17 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1820,11 +1846,17 @@ if conf.has('WITH_LIBVIRTD')
'pvs', 'vgs', 'lvs',
]
foreach name : lvm_progs
lvm_enable = false
endif
endforeach
-@@ -1879,7 +1920,7 @@ if conf.has('WITH_LIBVIRTD')
+@@ -1834,7 +1866,7 @@ if conf.has('WITH_LIBVIRTD')
conf.set('WITH_STORAGE_LVM', 1)
foreach name : lvm_progs
endforeach
endif
endif
-@@ -2030,10 +2071,16 @@ if not get_option('nss').disabled()
+@@ -1985,10 +2017,16 @@ if not get_option('nss').disabled()
endif
if not get_option('numad').disabled() and numactl_dep.found()
endif
elif get_option('numad').enabled()
error('You must have numactl enabled for numad support.')
---- libvirt-8.10.0/build-aux/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.10.0/build-aux/meson.build 2022-06-15 21:13:56.995821452 +0200
-@@ -1,8 +1,3 @@
--flake8_path = ''
--if flake8_prog.found()
-- flake8_path = flake8_prog.full_path()
--endif
--
- if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin'
- make_prog = find_program('gmake')
- sed_prog = find_program('gsed')
---- libvirt-8.10.0/src/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
-+++ libvirt-8.10.0/src/meson.build 2022-06-15 21:23:22.326092128 +0200
-@@ -989,11 +989,11 @@ test(
- env: runutf8,
- )
-
--if augparse_prog.found()
-+if find_program('augparse', required: false).found()
- foreach data : augeas_test_data
+--- libvirt-9.10.0/scripts/rpcgen/meson.build.orig 2023-12-01 16:11:26.000000000 +0100
++++ libvirt-9.10.0/scripts/rpcgen/meson.build 2024-04-06 18:12:56.287832133 +0200
+@@ -3,7 +3,7 @@ subdir('rpcgen')
+ if tests_enabled[0]
+ subdir('tests')
+
+- if pytest_prog.found() and host_machine.system() != 'darwin'
++ if pytest_path != '' and host_machine.system() != 'darwin'
test(
- 'check-augeas-@0@'.format(data['name']),
-- augparse_prog,
-+ find_program('augparse'),
- args: [
- '-I', data['srcdir'],
- '-I', data['builddir'],
-@@ -1003,7 +1003,7 @@ if augparse_prog.found()
- endforeach
- endif
+ 'rpcgen-pytest',
+ python3_prog,
+--- libvirt-9.10.0/src/meson.build.orig 2024-04-05 22:18:26.619433380 +0200
++++ libvirt-9.10.0/src/meson.build 2024-04-06 08:12:28.779676565 +0200
+@@ -1029,11 +1029,11 @@ if tests_enabled[0]
+ suite: 'script'
+ )
+
+- if augparse_prog.found()
++ if find_program('augparse', required: false).found()
+ foreach data : augeas_test_data
+ test(
+ 'check-augeas-@0@'.format(data['name']),
+- augparse_prog,
++ find_program('augparse'),
+ args: [
+ '-I', data['srcdir'],
+ '-I', data['builddir'],
+@@ -1044,7 +1044,7 @@ if tests_enabled[0]
+ endforeach
+ endif
--if pdwtags_prog.found() and cc.get_id() != 'clang'
-+if pdwtags_path != '' and cc.get_id() != 'clang'
- foreach proto : check_protocols
- lib = proto['lib']
- test(
-@@ -1014,7 +1014,7 @@ if pdwtags_prog.found() and cc.get_id()
- proto['name'],
- lib.name(),
- lib.full_path(),
-- pdwtags_prog.full_path(),
-+ pdwtags_path,
- files('@0@-structs'.format(proto['name'])),
- ],
- env: runutf8,
+- if pdwtags_prog.found() and cc.get_id() != 'clang'
++ if pdwtags_path != '' and cc.get_id() != 'clang'
+ foreach proto : check_protocols
+ lib = proto['lib']
+ test(
+@@ -1055,7 +1055,7 @@ if tests_enabled[0]
+ proto['name'],
+ lib.name(),
+ lib.full_path(),
+- pdwtags_prog.full_path(),
++ pdwtags_path,
+ files('@0@-structs'.format(proto['name'])),
+ ],
+ env: runutf8,
--- libvirt-8.8.0/meson_options.txt.orig 2020-12-01 09:51:29.000000000 +0100
+++ libvirt-8.8.0/meson_options.txt 2022-06-15 21:47:27.468263121 +0200
@@ -102,3 +102,50 @@ option('numad', type: 'feature', value:
+
+option('addr2line_path', type: 'string', value: '', description: 'executable path')
+option('augparse_path', type: 'string', value: '', description: 'executable path')
++option('black_path', type: 'string', value: '', description: 'executable path')
+option('dmidecode_path', type: 'string', value: '', description: 'executable path')
+option('dnsmasq_path', type: 'string', value: '', description: 'executable path')
+option('ebtables_path', type: 'string', value: '', description: 'executable path')
+option('numad_path', type: 'string', value: '', description: 'executable path')
+option('ovs_vsctl_path', type: 'string', value: '', description: 'executable path')
+option('parted_path', type: 'string', value: '', description: 'executable path')
++option('passt_path', type: 'string', value: '', description: 'executable path')
+option('pdwtags_path', type: 'string', value: '', description: 'executable path')
+option('pvcreate_path', type: 'string', value: '', description: 'executable path')
+option('pvremove_path', type: 'string', value: '', description: 'executable path')
+option('pvs_path', type: 'string', value: '', description: 'executable path')
-+option('qemu_bridge_path', type: 'string', value: '', description: 'executable path')
-+option('qemu_dbus_daemon_path', type: 'string', value: '', description: 'executable path')
-+option('qemu_pr_path', type: 'string', value: '', description: 'executable path')
++option('pytest_path', type: 'string', value: '', description: 'executable path')
+option('qemu_slirp_path', type: 'string', value: '', description: 'executable path')
+option('radvd_path', type: 'string', value: '', description: 'executable path')
+option('rmmod_path', type: 'string', value: '', description: 'executable path')
projects / packages / libvirt.git / blobdiff