From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, "Willian Rampazzo" <willianr@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 06/40] build: validate that system capstone works before using it
Date: Mon, 12 Jul 2021 13:26:19 +0100 [thread overview]
Message-ID: <20210712122653.11354-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org>
From: Daniel P. Berrangé <berrange@redhat.com>
Some versions of capstone have shipped a broken pkg-config file which
puts the -I path without the trailing '/capstone' suffix. This breaks
the ability to "#include <capstone.h>". Upstream and most distros have
fixed this, but a few stragglers remain, notably FreeBSD.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210625172211.451010-2-berrange@redhat.com>
Message-Id: <20210709143005.1554-7-alex.bennee@linaro.org>
diff --git a/meson.build b/meson.build
index eb362ee5eb..cea8196e53 100644
--- a/meson.build
+++ b/meson.build
@@ -1644,6 +1644,19 @@ if capstone_opt in ['enabled', 'auto', 'system']
kwargs: static_kwargs, method: 'pkg-config',
required: capstone_opt == 'system' or
capstone_opt == 'enabled' and not have_internal)
+
+ # Some versions of capstone have broken pkg-config file
+ # that reports a wrong -I path, causing the #include to
+ # fail later. If the system has such a broken version
+ # do not use it.
+ if capstone.found() and not cc.compiles('#include <capstone.h>',
+ dependencies: [capstone])
+ capstone = not_found
+ if capstone_opt == 'system'
+ error('system capstone requested, it does not appear to work')
+ endif
+ endif
+
if capstone.found()
capstone_opt = 'system'
elif have_internal
--
2.20.1
next prev parent reply other threads:[~2021-07-12 12:29 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 12:26 [PULL for 6.1 00/40] testing and plugin updates Alex Bennée
2021-07-12 12:26 ` [PULL 01/40] Jobs based on custom runners: documentation and configuration placeholder Alex Bennée
2021-07-12 12:26 ` [PULL 02/40] Jobs based on custom runners: build environment docs and playbook Alex Bennée
2021-07-12 12:26 ` [PULL 03/40] Jobs based on custom runners: docs and gitlab-runner setup playbook Alex Bennée
2021-07-12 12:26 ` [PULL 04/40] Jobs based on custom runners: add job definitions for QEMU's machines Alex Bennée
2021-07-12 12:26 ` [PULL 05/40] tests/tcg: also disable the signals test for plugins Alex Bennée
2021-07-12 12:26 ` Alex Bennée [this message]
2021-07-12 12:26 ` [PULL 07/40] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Alex Bennée
2021-07-12 12:26 ` [PULL 08/40] cirrus: delete FreeBSD and macOS jobs Alex Bennée
2021-07-12 12:26 ` [PULL 09/40] hw/usb/ccid: remove references to NSS Alex Bennée
2021-07-12 12:26 ` [PULL 10/40] tests/docker: don't use BUILDKIT in GitLab either Alex Bennée
2021-07-12 12:26 ` [PULL 11/40] tests/docker: use project specific container registries Alex Bennée
2021-07-12 12:26 ` [PULL 12/40] tests/docker: use explicit docker.io registry Alex Bennée
2021-07-12 12:26 ` [PULL 13/40] tests/docker: remove FEATURES env var from templates Alex Bennée
2021-07-12 12:26 ` [PULL 14/40] tests/docker: fix sorting in package lists Alex Bennée
2021-07-12 12:26 ` [PULL 15/40] tests/docker: fix mistakes in centos " Alex Bennée
2021-07-12 12:26 ` [PULL 16/40] tests/docker: fix mistakes in fedora package list Alex Bennée
2021-07-12 12:26 ` [PULL 17/40] tests/docker: fix mistakes in ubuntu package lists Alex Bennée
2021-07-12 12:26 ` [PULL 18/40] tests/docker: remove mingw packages from Fedora Alex Bennée
2021-07-12 12:26 ` [PULL 19/40] tests/docker: expand centos8 package list Alex Bennée
2021-07-12 12:26 ` [PULL 20/40] tests/docker: expand fedora " Alex Bennée
2021-07-12 12:26 ` [PULL 21/40] tests/docker: expand ubuntu1804 " Alex Bennée
2021-07-12 12:26 ` [PULL 22/40] tests/docker: expand ubuntu2004 " Alex Bennée
2021-07-12 12:26 ` [PULL 23/40] tests/docker: expand opensuse-leap " Alex Bennée
2021-07-12 12:26 ` [PULL 24/40] tests/vm: update NetBSD to 9.2 Alex Bennée
2021-07-12 12:26 ` [PULL 25/40] tests/vm: update openbsd to release 6.9 Alex Bennée
2021-07-12 12:26 ` [PULL 26/40] tests/tcg: make test-mmap a little less aggressive Alex Bennée
2021-07-12 12:26 ` [PULL 27/40] plugins: fix-up handling of internal hostaddr for 32 bit Alex Bennée
2021-07-12 12:26 ` [PULL 28/40] meson.build: move TCG plugin summary output Alex Bennée
2021-07-12 12:26 ` [PULL 29/40] configure: don't allow plugins to be enabled for a non-TCG build Alex Bennée
2021-07-12 12:26 ` [PULL 30/40] configure: add an explicit static and plugins check Alex Bennée
2021-07-12 12:26 ` [PULL 31/40] configure: stop user enabling plugins on Windows for now Alex Bennée
2021-07-12 12:26 ` [PULL 32/40] tcg/plugins: enable by default for most TCG builds Alex Bennée
2021-07-16 6:54 ` Christian Borntraeger
2021-07-16 11:28 ` Christian Borntraeger
2021-07-16 13:16 ` Alex Bennée
2021-07-16 14:51 ` Richard Henderson
2021-07-16 14:58 ` Christian Borntraeger
2021-07-16 15:31 ` Christian Borntraeger
2021-07-16 16:02 ` Richard Henderson
2021-07-12 12:26 ` [PULL 33/40] contrib/plugins: enable -Wall for building plugins Alex Bennée
2021-07-12 12:26 ` [PULL 34/40] contrib/plugins: add execlog to log instruction execution and memory access Alex Bennée
2021-07-12 12:26 ` [PULL 35/40] docs/devel: tcg-plugins: add execlog plugin description Alex Bennée
2021-07-12 12:26 ` [PULL 36/40] plugins: Added a new cache modelling plugin Alex Bennée
2021-07-12 12:26 ` [PULL 37/40] plugins/cache: Enable cache parameterization Alex Bennée
2021-07-12 12:26 ` [PULL 38/40] plugins/cache: Added FIFO and LRU eviction policies Alex Bennée
2021-07-12 12:26 ` [PULL 39/40] docs/devel: Added cache plugin to the plugins docs Alex Bennée
2021-07-12 12:26 ` [PULL 40/40] MAINTAINERS: Added myself as a reviewer for TCG Plugins Alex Bennée
2021-07-12 12:56 ` [PULL for 6.1 00/40] testing and plugin updates Alex Bennée
2021-07-12 14:51 ` Alex Bennée
2021-07-12 22:19 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210712122653.11354-7-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).