From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: Kyle Evans <kevans@freebsd.org>,
richard.henderson@linaro.org, Laurent Vivier <laurent@vivier.eu>,
f4bug@amsat.org, Paolo Bonzini <pbonzinni@redhat.com>,
Warner Losh <wlosh@bsdimp.com>, Warner Losh <imp@bsdimp.com>
Subject: [PATCH v2 01/15] meson: *-user: only descend into *-user when configured
Date: Fri, 8 Oct 2021 17:14:52 -0600 [thread overview]
Message-ID: <20211008231506.17471-2-imp@bsdimp.com> (raw)
In-Reply-To: <20211008231506.17471-1-imp@bsdimp.com>
To increase flexibility, only descend into *-user when that is
configured. This allows *-user to selectively include directories based
on the host OS which may not exist on all hosts. Adopt Paolo's
suggestion of checking the configuration in the directories that know
about the configuration.
Message-Id: <20210926220103.1721355-2-f4bug@amsat.org>
Message-Id: <20210926220103.1721355-3-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Warner Losh <wlosh@bsdimp.com>
Acked-by: Paolo Bonzini <pbonzinni@redhat.com>
Sponsored by: Netflix
---
bsd-user/meson.build | 4 ++++
linux-user/meson.build | 4 ++++
meson.build | 3 +--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/bsd-user/meson.build b/bsd-user/meson.build
index 0369549340..243fb78930 100644
--- a/bsd-user/meson.build
+++ b/bsd-user/meson.build
@@ -1,3 +1,7 @@
+if not config_target.has_key('CONFIG_BSD_USER')
+ subdir_done()
+endif
+
bsd_user_ss.add(files(
'bsdload.c',
'elfload.c',
diff --git a/linux-user/meson.build b/linux-user/meson.build
index 9549f81682..602255a3d6 100644
--- a/linux-user/meson.build
+++ b/linux-user/meson.build
@@ -1,3 +1,7 @@
+if not config_target.has_key('CONFIG_LINUX_USER')
+ subdir_done()
+endif
+
linux_user_ss.add(files(
'elfload.c',
'exit.c',
diff --git a/meson.build b/meson.build
index 99a0a3e689..1f2da5f7d9 100644
--- a/meson.build
+++ b/meson.build
@@ -2303,10 +2303,9 @@ subdir('ebpf')
common_ss.add(libbpf)
-bsd_user_ss.add(files('gdbstub.c'))
specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
-linux_user_ss.add(files('gdbstub.c', 'thunk.c'))
+linux_user_ss.add(files('thunk.c'))
specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
# needed for fuzzing binaries
--
2.32.0
next prev parent reply other threads:[~2021-10-08 23:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 23:14 [PATCH v2 00/15] bsd-user: misc cleanup for aarch64 import Warner Losh
2021-10-08 23:14 ` Warner Losh [this message]
2021-10-09 14:40 ` [PATCH v2 01/15] meson: *-user: only descend into *-user when configured Warner Losh
2021-10-18 3:42 ` Kyle Evans
2021-10-18 4:29 ` Warner Losh
2021-10-18 5:02 ` Warner Losh
2021-10-18 5:26 ` Kyle Evans
2021-10-18 14:09 ` Warner Losh
2021-10-18 10:17 ` Philippe Mathieu-Daudé
2021-10-08 23:14 ` [PATCH v2 02/15] bsd-user/target_os-user.h: Remove support for FreeBSD older than 12.0 Warner Losh
2021-10-14 15:14 ` Kyle Evans
2021-10-08 23:14 ` [PATCH v2 03/15] bsd-user/strace.list: Remove support for FreeBSD versions " Warner Losh
2021-10-14 15:14 ` Kyle Evans
2021-10-08 23:14 ` [PATCH v2 04/15] bsd-user: TARGET_RESET define is unused, remove it Warner Losh
2021-10-18 3:33 ` Kyle Evans
2021-10-08 23:14 ` [PATCH v2 05/15] bsd-user: export get_errno and is_error from syscall.c Warner Losh
2021-10-18 3:33 ` Kyle Evans
2021-10-08 23:14 ` [PATCH v2 06/15] bsd-user/errno_defs.h: Add internal error numbers Warner Losh
2021-10-18 3:34 ` Kyle Evans
2021-10-08 23:14 ` [PATCH v2 07/15] bsd-user: move TARGET_MC_GET_CLEAR_RET to target_os_signal.h Warner Losh
2021-10-18 3:34 ` Kyle Evans
2021-10-08 23:14 ` [PATCH v2 08/15] bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder Warner Losh
2021-10-18 3:35 ` Kyle Evans
2021-10-08 23:15 ` [PATCH v2 09/15] bsd-user/target_os_elf: If ELF_HWCAP2 is defined, publish it Warner Losh
2021-10-18 3:35 ` Kyle Evans
2021-10-08 23:15 ` [PATCH v2 10/15] bsd-user: Remove used from TaskState Warner Losh
2021-10-18 3:35 ` Kyle Evans
2021-10-08 23:15 ` [PATCH v2 11/15] bsd-user: Add stop_all_tasks Warner Losh
2021-10-09 16:15 ` Richard Henderson
2021-10-18 3:44 ` Kyle Evans
2021-10-08 23:15 ` [PATCH v2 12/15] bsd-user/sysarch: Move to using do_freebsd_arch_sysarch interface Warner Losh
2021-10-18 3:36 ` Kyle Evans
2021-10-08 23:15 ` [PATCH v2 13/15] bsd-user/sysarch: Provide a per-arch framework for sysarch syscall Warner Losh
2021-10-18 3:37 ` Kyle Evans
2021-10-08 23:15 ` [PATCH v2 14/15] bsd-user: Rename sigqueue to qemu_sigqueue Warner Losh
2021-10-18 3:36 ` Kyle Evans
2021-10-08 23:15 ` [PATCH v2 15/15] bsd-user/signal: Create a dummy signal queueing function Warner Losh
2021-10-09 16:15 ` Richard Henderson
2021-10-18 3:44 ` Kyle Evans
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=20211008231506.17471-2-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=f4bug@amsat.org \
--cc=kevans@freebsd.org \
--cc=laurent@vivier.eu \
--cc=pbonzinni@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=wlosh@bsdimp.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).