diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-19 08:44:56 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:30:08 -0400 |
| commit | a81df1b68b656f2487f556240baf2af83e60ec6c (patch) | |
| tree | eb98104c0a66b6a6d7675055d92c36b60d683796 /scripts | |
| parent | 245dac4a1bef719d648e20c84bbf3dcaf50de988 (diff) | |
| download | qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.zip qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.tar.gz qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.tar.bz2 | |
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')
| -rw-r--r--[-rwxr-xr-x] | scripts/qapi-gen.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/tracetool.py | 0 | ||||
| -rw-r--r-- | scripts/tracetool/backend/dtrace.py | 2 | ||||
| -rw-r--r-- | scripts/tracetool/backend/ust.py | 6 |
4 files changed, 2 insertions, 6 deletions
diff --git a/scripts/qapi-gen.py b/scripts/qapi-gen.py index 4b03f7d..4b03f7d 100755..100644 --- a/scripts/qapi-gen.py +++ b/scripts/qapi-gen.py diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 3114624..3114624 100755..100644 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py index fc0c8fc..e17edc9 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 6c0a5f8..c857516 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, '', |