On 1/27/21 9:56 PM, Philippe Mathieu-Daudé wrote: > Hi Stefan, > > On Mon, Jan 25, 2021 at 5:40 PM Philippe Mathieu-Daudé > <phi...@redhat.com> wrote:> >> On 1/25/21 12:09 PM, Stefan Hajnoczi wrote: >>> Re-generate tracetool output when the tracetool source code changes. Use >>> the same approach as qapi_gen_depends and introduce a tracetool_depends >>> files list so meson is aware of the dependencies. >>> >>> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> >>> --- >>> meson.build | 28 +++++++++++++++++++++++++++- >>> trace/meson.build | 21 ++++++++++++++------- >>> 2 files changed, 41 insertions(+), 8 deletions(-) > > Please do not merge "trace: make the 'log' backend timestamp configurable" > without this patch -- even better, queue this one directly after it -- as this > gave me troubles with the multiple directories I'm using to build: > > In file included from trace/trace-io.c:5: > trace/trace-io.h: In function ‘_nocheck__trace_qio_channel_command_wait’: > trace/trace-io.h:1756:13: error: ‘message_with_timestamp’ undeclared > (first use in this function); did you mean ‘error_with_timestamp’? > 1756 | if (message_with_timestamp) { > | ^~~~~~~~~~~~~~~~~~~~~~ > | error_with_timestamp > ninja: build stopped: subcommand failed.
I just realized bisecting, this problem is present when jumping from *after* 0572d6cd29d to *before* it. Range [7fd51e68c34 -> 0572d6cd29d]. I doubt there is much we can do :(