| Message ID | 20210320164730.33285-1-jrtc27@jrtc27.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | meson: Propagate gnutls dependency to migration | expand |
On 20/03/21 17:47, Jessica Clarke wrote: > Commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2 neglected to fix this > for softmmu configs, which pull in migration's use of gnutls. > > Signed-off-by: Jessica Clarke <jrtc27@jrtc27.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')) > Hi, can you explain in the commit message the compilation failure that is being fixed here? Paolo
On 20/03/21 18:06, Paolo Bonzini wrote: > On 20/03/21 17:47, Jessica Clarke wrote: >> Commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2 neglected to fix this >> for softmmu configs, which pull in migration's use of gnutls. >> >> Signed-off-by: Jessica Clarke <jrtc27@jrtc27.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')) >> > > Hi, can you explain in the commit message the compilation failure that > is being fixed here? I suppose it's migration/tls.c? Paolo
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'))
Commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2 neglected to fix this for softmmu configs, which pull in migration's use of gnutls. Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com> --- migration/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)