diff options
| author | Thomas Huth | 2022-05-16 16:58:23 +0200 |
|---|---|---|
| committer | Thomas Huth | 2022-05-18 08:54:22 +0200 |
| commit | 83602083b4ada6ceb86bfb327e83556ebab120fc (patch) | |
| tree | 8b29a67b527332db99e375a4c8152c62e4055e85 /configure | |
| parent | capstone: Allow version 3.0.5 again (diff) | |
| download | qemu-83602083b4ada6ceb86bfb327e83556ebab120fc.tar.gz qemu-83602083b4ada6ceb86bfb327e83556ebab120fc.tar.xz qemu-83602083b4ada6ceb86bfb327e83556ebab120fc.zip | |
capstone: Remove the capstone submodule
Now that we allow compiling with Capstone v3.0.5 again, all our supported
build hosts should provide at least this version of the disassembler
library, so we do not need to ship this as a submodule anymore.
Message-Id: <20220516145823.148450-4-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -307,10 +307,8 @@ skip_meson=no # 1. Track which submodules are needed if test "$default_feature" = no ; then - capstone="disabled" slirp="disabled" else - capstone="auto" slirp="auto" fi fdt="auto" @@ -869,14 +867,6 @@ for opt do --enable-uuid|--disable-uuid) echo "$0: $opt is obsolete, UUID support is always built" >&2 ;; - --disable-capstone) capstone="disabled" - ;; - --enable-capstone) capstone="enabled" - ;; - --enable-capstone=git) capstone="internal" - ;; - --enable-capstone=*) capstone="$optarg" - ;; --with-git=*) git="$optarg" ;; --with-git-submodules=*) @@ -1567,16 +1557,6 @@ case "$fdt" in esac ########################################## -# capstone - -case "$capstone" in - auto | enabled | internal) - # Simpler to always update submodule, even if not needed. - git_submodules="${git_submodules} capstone" - ;; -esac - -########################################## # check and set a backend for coroutine # We prefer ucontext, but it's not always possible. The fallback @@ -2220,7 +2200,6 @@ if test "$skip_meson" = no; then test "$werror" = yes && meson_option_add -Dwerror=true # QEMU options - test "$capstone" != auto && meson_option_add "-Dcapstone=$capstone" test "$cfi" != false && meson_option_add "-Dcfi=$cfi" test "$fdt" != auto && meson_option_add "-Dfdt=$fdt" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE" |