[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/12] meson: Propagate gnutls dependency to migration
From: |
Paolo Bonzini |
Subject: |
[PULL 01/12] meson: Propagate gnutls dependency to migration |
Date: |
Thu, 1 Apr 2021 13:22:12 +0200 |
From: Jessica Clarke <jrtc27@jrtc27.com>
Commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2 neglected to fix this
for softmmu configs, which pull in migration's use of gnutls.
This fixes the following compilation failure on Arm-based Macs:
In file included from migration/multifd.c:23:
In file included from migration/tls.h:25:
In file included from include/io/channel-tls.h:26:
In file included from include/crypto/tlssession.h:24:
include/crypto/tlscreds.h:28:10: fatal error: 'gnutls/gnutls.h' file not found
#include <gnutls/gnutls.h>
^~~~~~~~~~~~~~~~~
1 error generated.
(as well as for channel.c and tls.c)
Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20210320171221.37437-1-jrtc27@jrtc27.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
migration/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/migration/meson.build b/migration/meson.build
index 9645f44005..6fa2f8745d 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -24,7 +24,7 @@ softmmu_ss.add(files(
'savevm.c',
'socket.c',
'tls.c',
-))
+), gnutls)
softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c'))
softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c'))
--
2.30.1
- [PULL 00/12] Misc patches for QEMU 6.0-rc2, Paolo Bonzini, 2021/04/01
- [PULL 01/12] meson: Propagate gnutls dependency to migration,
Paolo Bonzini <=
- [PULL 07/12] replay: notify CPU on event, Paolo Bonzini, 2021/04/01
- [PULL 04/12] replay: fix recursive checkpoints, Paolo Bonzini, 2021/04/01
- [PULL 09/12] configure: Do not use default_feature for EXESUF, Paolo Bonzini, 2021/04/01
- [PULL 03/12] qapi: qom: do not use target-specific conditionals, Paolo Bonzini, 2021/04/01
- [PULL 06/12] icount: get rid of static variable, Paolo Bonzini, 2021/04/01
- [PULL 10/12] hexagon: do not specify executables as inputs, Paolo Bonzini, 2021/04/01
- [PULL 02/12] target/i386: Verify memory operand for lcall and ljmp, Paolo Bonzini, 2021/04/01
- [PULL 12/12] docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document, Paolo Bonzini, 2021/04/01
- [PULL 11/12] hexagon: do not specify Python scripts as inputs, Paolo Bonzini, 2021/04/01
- [PULL 08/12] target/openrisc: fix icount handling for timer instructions, Paolo Bonzini, 2021/04/01