]> git.proxmox.com Git - mirror_qemu.git/commit - meson.build
trace: fix compilation with lttng-ust >= 2.13
authorMarc-André Lureau <marcandre.lureau@redhat.com>
Mon, 28 Mar 2022 08:47:13 +0000 (12:47 +0400)
committerThomas Huth <thuth@redhat.com>
Fri, 1 Apr 2022 11:06:07 +0000 (13:06 +0200)
commite32aaa5a19e24233180042f84a0235a209de71cc
treec4afcc1cb571161e7a40d28a53e0df5b5ecf9df6
parenta136d17590a03ad4cf4fabeffe49d246b9130103
trace: fix compilation with lttng-ust >= 2.13

On Fedora 36, with lttng-ust 2.13.1, compilation fails with:

In file included from trace/trace-ust-all.h:49085,
                 from trace/trace-ust-all.c:13:
/usr/include/lttng/tracepoint-event.h:67:10: error: #include expects "FILENAME" or <FILENAME>
   67 | #include LTTNG_UST_TRACEPOINT_INCLUDE
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

In lttng-ust commit 41858e2b6e8 ("Fix: don't do macro expansion in
tracepoint file name") from 2012, starting from lttng-ust 2.1, the API
was changed to expect TRACEPOINT_INCLUDE to be defined as a string.

In lttng-ust commit d2966b4b0b2 ("Remove TRACEPOINT_INCLUDE_FILE
macro"), in 2021, the compatibility macro was removed.

Use the "new" API from 2012, and bump the version requirement to 2.1 to
fix compilation with >= 2.13.

According to repology, all distributions we support have >= 2.1 (centos
8 has oldest with 2.8.1 afaict)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220328084717.367993-2-marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
meson.build
scripts/tracetool/format/ust_events_h.py