[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v5 08/44] build: validate that system capstone works before using
From: |
Alex Bennée |
Subject: |
[PULL v5 08/44] build: validate that system capstone works before using it |
Date: |
Wed, 14 Jul 2021 16:00:00 +0100 |
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 512ee2e926..89c09ed7ea 100644
--- a/meson.build
+++ b/meson.build
@@ -1657,6 +1657,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
- [PULL v5 00/44] testing, build and plugin updates, Alex Bennée, 2021/07/14
- [PULL v5 01/44] Jobs based on custom runners: documentation and configuration placeholder, Alex Bennée, 2021/07/14
- [PULL v5 03/44] Jobs based on custom runners: docs and gitlab-runner setup playbook, Alex Bennée, 2021/07/14
- [PULL v5 05/44] tests/tcg: also disable the signals test for plugins, Alex Bennée, 2021/07/14
- [PULL v5 08/44] build: validate that system capstone works before using it,
Alex Bennée <=
- [PULL v5 04/44] Jobs based on custom runners: add job definitions for QEMU's machines, Alex Bennée, 2021/07/14
- [PULL v5 07/44] disable modular TCG on Darwin, Alex Bennée, 2021/07/14
- [PULL v5 02/44] Jobs based on custom runners: build environment docs and playbook, Alex Bennée, 2021/07/14
- [PULL v5 09/44] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run, Alex Bennée, 2021/07/14
- [PULL v5 06/44] meson: fix condition for io_uring stubs, Alex Bennée, 2021/07/14
- [PULL v5 10/44] cirrus: delete FreeBSD and macOS jobs, Alex Bennée, 2021/07/14
- [PULL v5 11/44] hw/usb/ccid: remove references to NSS, Alex Bennée, 2021/07/14
- [PULL v5 14/44] tests/docker: use explicit docker.io registry, Alex Bennée, 2021/07/14
- [PULL v5 12/44] tests/docker: don't use BUILDKIT in GitLab either, Alex Bennée, 2021/07/14
- [PULL v5 39/44] docs/devel: tcg-plugins: add execlog plugin description, Alex Bennée, 2021/07/14