diff options
author | Thomas Huth <thuth@redhat.com> | 2022-04-08 18:20:47 +0200 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2022-09-26 17:23:47 +0200 |
commit | 5890258aeeba303704ec1adca415e46067800777 (patch) | |
tree | 2c19c898995de0c27f7c91fe598c5836dda2b739 /meson_options.txt | |
parent | 59d1ce44396e3ad2330dc3261ff3da7ad3a16184 (diff) | |
download | qemu-5890258aeeba303704ec1adca415e46067800777.zip qemu-5890258aeeba303704ec1adca415e46067800777.tar.gz qemu-5890258aeeba303704ec1adca415e46067800777.tar.bz2 |
Remove the slirp submodule (i.e. compile only with an external libslirp)
Since QEMU 7.1 we don't support Ubuntu 18.04 anymore, so the last big
important Linux distro that did not have a pre-packaged libslirp has
been dismissed. All other major distros seem to have a libslirp package
in their distribution already - according to repology.org:
Fedora 35: 4.6.1
CentOS 8 (RHEL-8): 4.4.0
Debian 11: 4.4.0
OpenSUSE Leap 15.3: 4.3.1
Ubuntu LTS 20.04: 4.1.0
FreeBSD Ports: 4.7.0
NetBSD pkgsrc: 4.7.0
Homebrew: 4.7.0
MSYS2 mingw: 4.7.0
The only one that was still missing a libslirp package is OpenBSD - but
the next version (OpenBSD 7.2 which will be shipped in October) is going
to include a libslirp package. Since QEMU 7.2 will be published after
OpenBSD 7.2, we should be fine there, too.
So there is no real urgent need for keeping the slirp submodule in
the QEMU tree anymore. Thus let's drop the slirp submodule now and
rely on the libslirp packages from the distributions instead.
Message-Id: <20220824151122.704946-7-thuth@redhat.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'meson_options.txt')
-rw-r--r-- | meson_options.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt index 63f0725..6d25ef4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -199,6 +199,8 @@ option('l2tpv3', type : 'feature', value : 'auto', description: 'l2tpv3 network backend support') option('netmap', type : 'feature', value : 'auto', description: 'netmap network backend support') +option('slirp', type: 'feature', value: 'auto', + description: 'libslirp user mode network backend support') option('vde', type : 'feature', value : 'auto', description: 'vde network backend support') option('vmnet', type : 'feature', value : 'auto', @@ -264,9 +266,6 @@ option('vduse_blk_export', type: 'feature', value: 'auto', option('capstone', type: 'feature', value: 'auto', description: 'Whether and how to find the capstone library') -option('slirp', type: 'combo', value: 'auto', - choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], - description: 'Whether and how to find the slirp library') option('fdt', type: 'combo', value: 'auto', choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], description: 'Whether and how to find the libfdt library') |