]> git.proxmox.com Git - pve-qemu.git/commitdiff
buildsys: fix build-dependencies on headers for 'vma' and 'pbs_restore'
authorDominik Csapak <d.csapak@proxmox.com>
Thu, 18 Nov 2021 07:05:38 +0000 (08:05 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 18 Nov 2021 07:11:57 +0000 (08:11 +0100)
both of them depend on generated header files, so we have to specify
them as sources. Otherwise, it happens (at least on some machines)
that they will be compiled before the headers are generated, aborting
the build.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch
debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch

index 0e939bfa1359cd23cdf363b09fd42899a9b8f8ae..31cd97e7350f31e90011b2b52fda3c7017833134 100644 (file)
@@ -46,7 +46,7 @@ index b3e7ec0e92..b84f62f882 100644
    qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
                 dependencies: [blockdev, qemuutil, gnutls], install: true)
  
-+  vma = executable('vma', files('vma.c', 'vma-reader.c'),
++  vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
 +                   dependencies: [authz, block, crypto, io, qom], install: true)
 +
    subdir('storage-daemon')
index 8178a1332d2ca80213207fc63846ba638ccb1e92..c5ae406fb47842c2f62a162ecd3eb781fc0b7abd 100644 (file)
@@ -16,10 +16,10 @@ index c05c926cc3..69a0fe80ef 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -2749,6 +2749,10 @@ if have_tools
-   vma = executable('vma', files('vma.c', 'vma-reader.c'),
+   vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
                     dependencies: [authz, block, crypto, io, qom], install: true)
  
-+  pbs_restore = executable('pbs-restore', files('pbs-restore.c'),
++  pbs_restore = executable('pbs-restore', files('pbs-restore.c') + genh,
 +                  dependencies: [authz, block, crypto, io, qom,
 +                    libproxmox_backup_qemu], install: true)
 +