]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
access: fix po_check when polkit is disabled
authorDaniel P. Berrangé <berrange@redhat.com>
Thu, 9 Jan 2025 10:30:07 +0000 (10:30 +0000)
committerDaniel P. Berrangé <berrange@redhat.com>
Mon, 13 Jan 2025 09:35:16 +0000 (09:35 +0000)
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 <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/access/meson.build

index 0cc9cf2b7926a6bd07e931457517b5e9f5c58d03..d1336c0093b5abb68f0c9f27c9e5ad9b58ad140d 100644 (file)
@@ -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,