[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/8] capstone: Allow version 3.0.5 again
From: |
Thomas Huth |
Subject: |
[PULL 7/8] capstone: Allow version 3.0.5 again |
Date: |
Wed, 18 May 2022 11:04:37 +0200 |
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>
---
meson.build | 2 +-
.gitlab-ci.d/buildtest.yml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 53a4728250..526ff29a86 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)
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 0aea7ab84c..a4d43d743b 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
--
2.27.0
- [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...), Thomas Huth, 2022/05/18
- [PULL 7/8] capstone: Allow version 3.0.5 again,
Thomas Huth <=
- [PULL 2/8] Remove Ubuntu 18.04 container support from the repository, Thomas Huth, 2022/05/18
- [PULL 5/8] docs/about: Update the support statement for Windows, Thomas Huth, 2022/05/18
- [PULL 1/8] gitlab-ci: Switch the container of the 'check-patch' & 'check-dco' jobs, Thomas Huth, 2022/05/18
- [PULL 6/8] tests/vm: Add capstone to the NetBSD and OpenBSD VMs, Thomas Huth, 2022/05/18
- [PULL 3/8] tests/qtest: fix registration of ABRT handler for QEMU cleanup, Thomas Huth, 2022/05/18
- [PULL 8/8] capstone: Remove the capstone submodule, Thomas Huth, 2022/05/18
- [PULL 4/8] tests/qtest: use prctl(PR_SET_PDEATHSIG) as fallback to kill QEMU, Thomas Huth, 2022/05/18
- Re: [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...), Richard Henderson, 2022/05/18