diff options
| author | Peter Maydell | 2021-07-13 12:26:09 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-07-13 12:26:09 +0200 |
| commit | 5e05c40ced78ed9a3c25a82ec1f144bb7baffe3f (patch) | |
| tree | e193851f37a32c29c2fc20d93541eb64c7ed6069 /meson.build | |
| parent | Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20210712' into staging (diff) | |
| parent | trace, lttng: require .pc files (diff) | |
| download | qemu-5e05c40ced78ed9a3c25a82ec1f144bb7baffe3f.tar.gz qemu-5e05c40ced78ed9a3c25a82ec1f144bb7baffe3f.tar.xz qemu-5e05c40ced78ed9a3c25a82ec1f144bb7baffe3f.zip | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging
Pull request
# gpg: Signature made Mon 12 Jul 2021 17:49:46 BST
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha-gitlab/tags/tracing-pull-request:
trace, lttng: require .pc files
trace/simple: add st_init_group
trace/simple: pass iter to st_write_event_mapping
trace: add trace_event_iter_init_group
trace: iter init tweaks
qemu-trace-stap: changing SYSTEMTAP_TAPSET considered harmful.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 6cd2dc582a..b0e2b9a8a0 100644 --- a/meson.build +++ b/meson.build @@ -319,10 +319,6 @@ lttng = not_found if 'CONFIG_TRACE_UST' in config_host lttng = declare_dependency(link_args: config_host['LTTNG_UST_LIBS'].split()) endif -urcubp = not_found -if 'CONFIG_TRACE_UST' in config_host - urcubp = declare_dependency(link_args: config_host['URCU_BP_LIBS'].split()) -endif pixman = not_found if have_system or have_tools pixman = dependency('pixman-1', required: have_system, version:'>=0.21.8', |