diff options
| author | Paolo Bonzini | 2020-08-19 14:44:56 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-08-21 12:30:08 +0200 |
| commit | a81df1b68b656f2487f556240baf2af83e60ec6c (patch) | |
| tree | eb98104c0a66b6a6d7675055d92c36b60d683796 /scripts/tracetool/backend | |
| parent | meson: add testsuite Makefile generator (diff) | |
| download | qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.tar.gz qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.tar.xz qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.zip | |
libqemuutil, qapi, trace: convert to meson
This shows how to do some "computations" in meson.build using its array
and dictionary data structures, and also a basic usage of the sourceset
module for conditional compilation.
Notice the new "if have_system" part of util/meson.build, which fixes
a bug in the old build system was buggy: util/dbus.c was built even for
non-softmmu builds, but the dependency on -lgio was lost when the linking
was done through libqemuutil.a. Because all of its users required gio
otherwise, the bug was hidden. Meson instead propagates libqemuutil's
dependencies down to its users, and shows the problem.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/tracetool/backend')
| -rw-r--r-- | scripts/tracetool/backend/dtrace.py | 2 | ||||
| -rw-r--r-- | scripts/tracetool/backend/ust.py | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py index fc0c8fc52f..e17edc9b9d 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -38,7 +38,7 @@ def generate_h_begin(events, group): if group == "root": header = "trace-dtrace-root.h" else: - header = "trace-dtrace.h" + header = "trace-dtrace-%s.h" % group # Workaround for ust backend, which also includes <sys/sdt.h> and may # require SDT_USE_VARIADIC to be defined. If dtrace includes <sys/sdt.h> diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py index 6c0a5f8d68..c857516f21 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -19,11 +19,7 @@ PUBLIC = True def generate_h_begin(events, group): - if group == "root": - header = "trace-ust-root.h" - else: - header = "trace-ust.h" - + header = 'trace-ust-' + group + '.h' out('#include <lttng/tracepoint.h>', '#include "%s"' % header, '', |