[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/17] trace: fix creation of systemtap files
From: |
Paolo Bonzini |
Subject: |
[PULL 01/17] trace: fix creation of systemtap files |
Date: |
Thu, 27 Aug 2020 12:59:40 -0400 |
From: Stefan Hajnoczi <stefanha@redhat.com>
The "exe_name" variable was renamed to exe['name'], so systemtap
files fail to build.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index f0fe5f8799..f2aa5a7700 100644
--- a/meson.build
+++ b/meson.build
@@ -1029,14 +1029,14 @@ foreach target : target_dirs
if 'CONFIG_TRACE_SYSTEMTAP' in config_host
foreach stp: [
- {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_dir()
/ exe_name, 'install': false},
- {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') /
get_option('bindir') / exe_name, 'install': true},
+ {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_dir()
/ exe['name'], 'install': false},
+ {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') /
get_option('bindir') / exe['name'], 'install': true},
{'ext': '-simpletrace.stp', 'fmt': 'simpletrace-stap', 'bin': '',
'install': true},
{'ext': '-log.stp', 'fmt': 'log-stap', 'bin': '', 'install': true},
]
- custom_target(exe_name + stp['ext'],
+ custom_target(exe['name'] + stp['ext'],
input: trace_events_all,
- output: exe_name + stp['ext'],
+ output: exe['name'] + stp['ext'],
capture: true,
install: stp['install'],
install_dir: config_host['qemu_datadir'] /
'../systemtap/tapset',
--
2.26.2
- [PULL 00/17] Meson fixes for 2020-08-27, Paolo Bonzini, 2020/08/27
- [PULL 03/17] meson: Don't make object files for dtrace on macOS, Paolo Bonzini, 2020/08/27
- [PULL 04/17] scripts/qemu-version.sh: Add missing space before ']', Paolo Bonzini, 2020/08/27
- [PULL 08/17] meson: move pixman detection to meson, Paolo Bonzini, 2020/08/27
- [PULL 10/17] configure: add --ninja option, Paolo Bonzini, 2020/08/27
- [PULL 11/17] meson: cleanup xkbcommon detection, Paolo Bonzini, 2020/08/27
- [PULL 06/17] meson: Fix chardev-baum.so name, Paolo Bonzini, 2020/08/27