public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH qemu] fix dependencies on headers for 'vma' and 'pbs_restore'
@ 2021-11-18  7:05 Dominik Csapak
  2021-11-18  7:21 ` [pve-devel] applied: " Thomas Lamprecht
  0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2021-11-18  7:05 UTC (permalink / raw)
  To: pve-devel

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>
---
thanks @wolfgang for helping me understand meson a bit better ;)

 .../pve/0025-PVE-Backup-add-vma-backup-format-code.patch      | 2 +-
 ...PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch
index 0e939bf..31cd97e 100644
--- a/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch
+++ b/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch
@@ -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')
diff --git a/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch b/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
index 8178a13..c5ae406 100644
--- a/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
+++ b/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
@@ -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)
 +
-- 
2.30.2





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-18  7:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18  7:05 [pve-devel] [PATCH qemu] fix dependencies on headers for 'vma' and 'pbs_restore' Dominik Csapak
2021-11-18  7:21 ` [pve-devel] applied: " Thomas Lamprecht

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal