diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-05 11:31:15 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-06 08:34:41 +0200 |
| commit | 4d34a86b2b4d28a2da66196c655a37888b85c036 (patch) | |
| tree | 7abcff12906c311a90d52912a78e0b3d93e4594d /net | |
| parent | 20b0a9f4f6bbe41aaadf6681c16ac73d289203e1 (diff) | |
| download | qemu-4d34a86b2b4d28a2da66196c655a37888b85c036.zip qemu-4d34a86b2b4d28a2da66196c655a37888b85c036.tar.gz qemu-4d34a86b2b4d28a2da66196c655a37888b85c036.tar.bz2 | |
slirp: Convert Makefile bits to meson bits
SLIRP uses Meson so it could become a subproject in the future,
but our choice of configure options is not yet supported in Meson
(https://github.com/mesonbuild/meson/pull/7740).
For now, build the library via the main meson.build just like for
capstone.
This improves the current state of affairs in that we will re-link
the qemu executables against a changed libslirp.a, which we wouldn't
do before-hand.
Tested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/meson.build b/net/meson.build index 6c2ec47..1c7e3a3 100644 --- a/net/meson.build +++ b/net/meson.build @@ -18,7 +18,7 @@ softmmu_ss.add(files( )) softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c')) -softmmu_ss.add(when: ['CONFIG_SLIRP', slirp], if_true: files('slirp.c')) +softmmu_ss.add(when: slirp, if_true: files('slirp.c')) softmmu_ss.add(when: ['CONFIG_VDE', vde], if_true: files('vde.c')) softmmu_ss.add(when: 'CONFIG_NETMAP', if_true: files('netmap.c')) vhost_user_ss = ss.source_set() |