From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Roman Bolshakov" <r.bolshakov@yadro.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Cameron Esfahani" <dirty@apple.com>
Subject: [PULL 03/17] meson: Don't make object files for dtrace on macOS
Date: Thu, 27 Aug 2020 12:59:42 -0400 [thread overview]
Message-ID: <20200827165956.12925-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com>
From: Roman Bolshakov <r.bolshakov@yadro.com>
dtrace on macOS uses unresolved symbols with a special prefix to define
probes [1], only headers should be generated for USDT (dtrace(1)). But
it doesn't support backwards compatible no-op -G flag [2] and implicit
build rules fail.
1. https://markmail.org/message/6grq2ygr5nwdwsnb
2. https://markmail.org/message/5xrxt2w5m42nojkz
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
trace/meson.build | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/trace/meson.build b/trace/meson.build
index 56e870848e..1c1fb31a61 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -39,12 +39,15 @@ foreach dir : [ '.' ] + trace_events_subdirs
output: fmt.format('trace-dtrace', 'h'),
input: trace_dtrace,
command: [ 'dtrace', '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ])
- trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'),
- output: fmt.format('trace-dtrace', 'o'),
- input: trace_dtrace,
- command: [ 'dtrace', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ])
+ trace_ss.add(trace_dtrace_h)
+ if host_machine.system() != 'darwin'
+ trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'),
+ output: fmt.format('trace-dtrace', 'o'),
+ input: trace_dtrace,
+ command: [ 'dtrace', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ])
+ trace_ss.add(trace_dtrace_o)
+ endif
- trace_ss.add(trace_dtrace_h, trace_dtrace_o)
genh += trace_dtrace_h
endif
endforeach
--
2.26.2
next prev parent reply other threads:[~2020-08-27 17:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 16:59 [PULL 00/17] Meson fixes for 2020-08-27 Paolo Bonzini
2020-08-27 16:59 ` [PULL 01/17] trace: fix creation of systemtap files Paolo Bonzini
2020-08-27 16:59 ` [PULL 02/17] meson: Build qemu-nbd on macOS again Paolo Bonzini
2020-08-27 18:06 ` Thomas Huth
2020-08-27 20:00 ` Eric Blake
2020-08-27 20:46 ` Paolo Bonzini
2020-08-27 16:59 ` Paolo Bonzini [this message]
2020-08-27 16:59 ` [PULL 04/17] scripts/qemu-version.sh: Add missing space before ']' Paolo Bonzini
2020-08-27 16:59 ` [PULL 05/17] meson: Fix meson build with --enable-libdaxctl Paolo Bonzini
2020-08-27 16:59 ` [PULL 06/17] meson: Fix chardev-baum.so name Paolo Bonzini
2020-08-27 16:59 ` [PULL 07/17] configure: default to PIE disabled on Windows platforms Paolo Bonzini
2020-08-27 16:59 ` [PULL 08/17] meson: move pixman detection to meson Paolo Bonzini
2020-08-27 16:59 ` [PULL 09/17] meson: skip SDL2 detection if --disable-system Paolo Bonzini
2020-08-27 16:59 ` [PULL 10/17] configure: add --ninja option Paolo Bonzini
2020-08-27 16:59 ` [PULL 11/17] meson: cleanup xkbcommon detection Paolo Bonzini
2020-08-27 16:59 ` [PULL 12/17] meson: don't require CONFIG_VTE for the GTK UI Paolo Bonzini
2020-08-27 16:59 ` [PULL 13/17] ninjatool: quote dollars in variables Paolo Bonzini
2020-08-27 16:59 ` [PULL 14/17] meson: fix relpath failure on Win32 Paolo Bonzini
2020-08-27 16:59 ` [PULL 15/17] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Paolo Bonzini
2020-08-27 16:59 ` [PULL 16/17] meson: set colorout to auto Paolo Bonzini
2020-08-27 16:59 ` [PULL 17/17] ninjatool: Fixes E$$: in generated Makefile.ninja Paolo Bonzini
2020-08-28 10:04 ` [PULL 00/17] Meson fixes for 2020-08-27 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200827165956.12925-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=berrange@redhat.com \
--cc=dirty@apple.com \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).