diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-11-25 14:06:37 +0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-12-08 13:48:58 -0500 |
| commit | 0df750e9d3a5fea5e19f4750582121c9293a9d71 (patch) | |
| tree | d1333e36fdf7bc7d8e5dbbbc8c7398748d6a2756 /contrib/vhost-user-scsi | |
| parent | 3d22bd27acd93281354b10c6bf787b720685eb80 (diff) | |
libvhost-user: make it a meson subproject
By making libvhost-user a subproject, check it builds
standalone (without the global QEMU cflags etc).
Note that the library still relies on QEMU include/qemu/atomic.h and
linux_headers/.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201125100640.366523-6-marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'contrib/vhost-user-scsi')
| -rw-r--r-- | contrib/vhost-user-scsi/meson.build | 3 | ||||
| -rw-r--r-- | contrib/vhost-user-scsi/vhost-user-scsi.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/meson.build index 257cbffc8e..044c50bf43 100644 --- a/contrib/vhost-user-scsi/meson.build +++ b/contrib/vhost-user-scsi/meson.build @@ -1,7 +1,6 @@ if 'CONFIG_LIBISCSI' in config_host executable('vhost-user-scsi', files('vhost-user-scsi.c'), - link_with: libvhost_user, - dependencies: [qemuutil, libiscsi], + dependencies: [qemuutil, libiscsi, vhost_user], build_by_default: targetos == 'linux', install: false) endif diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c index 4639440a70..4f6e3e2a24 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -15,7 +15,7 @@ #define inline __attribute__((gnu_inline)) /* required for libiscsi v1.9.0 */ #include <iscsi/scsi-lowlevel.h> #undef inline -#include "contrib/libvhost-user/libvhost-user-glib.h" +#include "libvhost-user-glib.h" #include "standard-headers/linux/virtio_scsi.h" |