diff options
| author | Thomas Huth <thuth@redhat.com> | 2022-05-16 16:58:22 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2022-05-18 08:54:22 +0200 |
| commit | 43ecd16678b74b281c3cc7de0dd62a36279b6025 (patch) | |
| tree | 840fa9624e6d195559508943b708a419f6199349 | |
| parent | 28e7e95e6bc374262a3f03cf7b6fb7a1b3c3ebbe (diff) | |
| download | qemu-43ecd16678b74b281c3cc7de0dd62a36279b6025.zip qemu-43ecd16678b74b281c3cc7de0dd62a36279b6025.tar.gz qemu-43ecd16678b74b281c3cc7de0dd62a36279b6025.tar.bz2 | |
capstone: Allow version 3.0.5 again
According to
https://lore.kernel.org/qemu-devel/20200921174118.39352-1-richard.henderson@linaro.org/
there was an issue with Capstone 3.0.4 from Ubuntu 18, which was the reason
for bumping our minimum Capstone requirement to version 4.0. And indeed,
compiling with that version 3.0.4 from Ubuntu 18.04 still fails (after
allowing it with a hack in meson.build). But now that we've dropped support
for Ubuntu 18.04, that issue is not relevant anymore. Compiling with Capstone
version 3.0.5 (e.g. used in Ubuntu 20.04) seems to work fine, so let's allow
that version again.
Message-Id: <20220516145823.148450-3-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | .gitlab-ci.d/buildtest.yml | 1 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 0aea7ab..a4d43d7 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -42,6 +42,7 @@ build-system-ubuntu: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-slirp=system + --enable-capstone=system TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build diff --git a/meson.build b/meson.build index 53a4728..526ff29 100644 --- a/meson.build +++ b/meson.build @@ -2525,7 +2525,7 @@ capstone = not_found capstone_opt = get_option('capstone') if capstone_opt in ['enabled', 'auto', 'system'] have_internal = fs.exists(meson.current_source_dir() / 'capstone/Makefile') - capstone = dependency('capstone', version: '>=4.0', + capstone = dependency('capstone', version: '>=3.0.5', kwargs: static_kwargs, method: 'pkg-config', required: capstone_opt == 'system' or capstone_opt == 'enabled' and not have_internal) |