diff options
| author | Marc-André Lureau | 2021-05-05 17:13:12 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-07-29 10:15:52 +0200 |
| commit | 3f55f97b14086b0f9f638e5bb784b3485b36d583 (patch) | |
| tree | 41c985bae83a7a6743468c3984d7c76c3547991f /subprojects | |
| parent | target/i386: fix typo in ctl_has_irq (diff) | |
| download | qemu-3f55f97b14086b0f9f638e5bb784b3485b36d583.tar.gz qemu-3f55f97b14086b0f9f638e5bb784b3485b36d583.tar.xz qemu-3f55f97b14086b0f9f638e5bb784b3485b36d583.zip | |
meson: fix meson 0.58 warning with libvhost-user subproject
Meson now checks that subprojects do not access files from parent
project. While we all agree this is best practice, libvhost-user also
want to share a few headers with QEMU, and libvhost-user isn't really a
standalone project at this point (although this is making the dependency
a bit more explicit).
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210505151313.203258-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'subprojects')
| l--------- | subprojects/libvhost-user/include/atomic.h | 1 | ||||
| -rw-r--r-- | subprojects/libvhost-user/libvhost-user.c | 2 | ||||
| -rw-r--r-- | subprojects/libvhost-user/meson.build | 6 | ||||
| l--------- | subprojects/libvhost-user/standard-headers/linux | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/subprojects/libvhost-user/include/atomic.h b/subprojects/libvhost-user/include/atomic.h new file mode 120000 index 0000000000..8c2be64f7b --- /dev/null +++ b/subprojects/libvhost-user/include/atomic.h @@ -0,0 +1 @@ +../../../include/qemu/atomic.h
\ No newline at end of file diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c index fab7ca17ee..2971ba0112 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -40,7 +40,7 @@ #endif -#include "qemu/atomic.h" +#include "include/atomic.h" #include "libvhost-user.h" diff --git a/subprojects/libvhost-user/meson.build b/subprojects/libvhost-user/meson.build index b03446e7cd..39825d9404 100644 --- a/subprojects/libvhost-user/meson.build +++ b/subprojects/libvhost-user/meson.build @@ -4,21 +4,17 @@ project('libvhost-user', 'c', threads = dependency('threads') glib = dependency('glib-2.0') -inc = include_directories('../../include', '../../linux-headers') vhost_user = static_library('vhost-user', files('libvhost-user.c'), - include_directories: inc, dependencies: threads, c_args: '-D_GNU_SOURCE') executable('link-test', files('link-test.c'), - link_whole: vhost_user, - include_directories: inc) + link_whole: vhost_user) vhost_user_glib = static_library('vhost-user-glib', files('libvhost-user-glib.c'), - include_directories: inc, link_with: vhost_user, dependencies: glib) diff --git a/subprojects/libvhost-user/standard-headers/linux b/subprojects/libvhost-user/standard-headers/linux new file mode 120000 index 0000000000..15a2378139 --- /dev/null +++ b/subprojects/libvhost-user/standard-headers/linux @@ -0,0 +1 @@ +../../../include/standard-headers/linux
\ No newline at end of file |