Re: [PATCH] meson: Build qemu-nbd on macOS again

["Daniel P. Berrangé" <berrange@redhat.com>]

On Mon, Aug 24, 2020 at 09:29:21AM -0500, Eric Blake wrote:
> On 8/23/20 3:32 AM, Thomas Huth wrote:
> > Before switching to the meson build system, we used to compile qemu-nbd
> > for macOS, too, which is especially important for running the iotests
> > there. Commit b7c70bf2c5 disabled it by accident, since it did not take
> > into consideration that the $bsd variable in the configure script was
> > also set to "yes" on macOS. Fix it by enabling qemu-nbd on all systems
> > but Windows now instead (which was likely the original intention of the
> > old code in the configure script).
> > 
> > Fixes: b7c70bf2c5 ("meson: qemu-{img,io,nbd}")
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >   meson.build | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> I can queue this through my NBD tree, although if there is a batch of meson
> fixes going in sooner than that, I don't mind if it goes there.
> 
> Acked-by: Eric Blake <eblake@redhat.com>

FYI, it is pretty trivial to enable building of qemu-nbd.exe on Windows,
which eanbles the conditional to be removed from meson entirely. I've
just CC you a series todo that.

> 
> > 
> > diff --git a/meson.build b/meson.build
> > index df5bf728b5..d79f849768 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1075,7 +1075,7 @@ if have_tools
> >     qemu_io = executable('qemu-io', files('qemu-io.c'),
> >                dependencies: [block, qemuutil], install: true)
> >     qemu_block_tools += [qemu_img, qemu_io]
> > -  if targetos == 'linux' or targetos == 'sunos' or targetos.endswith('bsd')
> > +  if targetos != 'windows'
> >       qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
> >                  dependencies: [block, qemuutil], install: true)
> >       qemu_block_tools += [qemu_nbd]
> > 
> 
> -- 
> Eric Blake, Principal Software Engineer
> Red Hat, Inc.           +1-919-301-3226
> Virtualization:  qemu.org | libvirt.org
> 
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|