From 9ab2cd48ea11ebddbcdf65039a208d880efd848a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 9 Jan 2025 10:30:07 +0000 Subject: [PATCH] access: fix po_check when polkit is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The generated org.libvirt.api.policy.in file was recently added to the POTFILES list as it contains translatable messages. It is only generated when WITH_POLKIT && WITH_LIBVIRTD is satisfied though, resulting in the 'po_check' syntax rule failing if either of those conditions are not met. It is harmless to unconditionally generate this file, as a separate rule takes care of of installing it, and the latter remains under the build conditions. Reviewed-by: Michal Privoznik Signed-off-by: Daniel P. Berrangé --- src/access/meson.build | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/access/meson.build b/src/access/meson.build index 0cc9cf2b79..d1336c0093 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -63,19 +63,22 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ) endforeach +# Generated outside the WITH_POLKIT / WITH_LIBVIRTD condition +# because syntax-check/po_check requires this to exist +polgen = custom_target( + 'org.libvirt.api.policy.in', + input: access_perm_h, + output: 'org.libvirt.api.policy.in', + command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@' ], + capture: true, + build_by_default: true, +) +access_generated += polgen + if conf.has('WITH_POLKIT') access_sources += access_polkit_sources if conf.has('WITH_LIBVIRTD') - polgen = custom_target( - 'org.libvirt.api.policy.in', - input: access_perm_h, - output: 'org.libvirt.api.policy.in', - command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@' ], - capture: true, - build_by_default: true, - ) - access_generated += polgen i18n.merge_file( input: polgen,