From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: lvivier@redhat.com, richard.henderson@linaro.org
Subject: [PATCH 3/3] meson: cleanup common-user/ build
Date: Tue, 21 Dec 2021 17:33:00 +0100 [thread overview]
Message-ID: <20211221163300.453146-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20211221163300.453146-1-pbonzini@redhat.com>
Do not go through a static_library, which is only necessary in order to reuse
some source files between emulators and tests. Instead just place common files
for all user-mode emulators in common_ss, similar to what is already done for
softmmu_ss in full system emulators.
The only disadvantage is that the include_directories under bsd-user/include/
and linux-user/include/ are now enabled for all targets rather than only
user mode emulators. This however is not different from how include/sysemu/
is available when building user mode emulators.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
common-user/meson.build | 2 +-
meson.build | 13 +------------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/common-user/meson.build b/common-user/meson.build
index 5cb42bc664..26212dda5c 100644
--- a/common-user/meson.build
+++ b/common-user/meson.build
@@ -1,6 +1,6 @@
common_user_inc += include_directories('host/' / host_arch)
-common_user_ss.add(files(
+user_ss.add(files(
'safe-syscall.S',
'safe-syscall-error.c',
))
diff --git a/meson.build b/meson.build
index b0af02b805..879628ab68 100644
--- a/meson.build
+++ b/meson.build
@@ -2377,7 +2377,6 @@ blockdev_ss = ss.source_set()
block_ss = ss.source_set()
chardev_ss = ss.source_set()
common_ss = ss.source_set()
-common_user_ss = ss.source_set()
crypto_ss = ss.source_set()
hwcore_ss = ss.source_set()
io_ss = ss.source_set()
@@ -2629,17 +2628,6 @@ subdir('common-user')
subdir('bsd-user')
subdir('linux-user')
-common_user_ss = common_user_ss.apply(config_all, strict: false)
-common_user = static_library('common-user',
- sources: common_user_ss.sources(),
- dependencies: common_user_ss.dependencies(),
- include_directories: common_user_inc,
- name_suffix: 'fa',
- build_by_default: false)
-common_user = declare_dependency(link_with: common_user)
-
-user_ss.add(common_user)
-
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
subdir('tests/qtest/fuzz')
@@ -2857,6 +2845,7 @@ common_all = common_ss.apply(config_all, strict: false)
common_all = static_library('common',
build_by_default: false,
sources: common_all.sources() + genh,
+ include_directories: common_user_inc,
implicit_include_directories: false,
dependencies: common_all.dependencies(),
name_suffix: 'fa')
--
2.33.1
next prev parent reply other threads:[~2021-12-21 16:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 16:32 [PATCH 0/3] build: some cleanups for common-user/ infrastructure Paolo Bonzini
2021-12-21 16:32 ` [PATCH 1/3] meson: reuse common_user_inc when building files specific to user-mode emulators Paolo Bonzini
2021-12-21 20:33 ` Richard Henderson
2021-12-21 16:32 ` [PATCH 2/3] user: move common-user includes to a subdirectory of {bsd, linux}-user/ Paolo Bonzini
2021-12-21 19:56 ` [PATCH 2/3] user: move common-user includes to a subdirectory of {bsd,linux}-user/ Richard Henderson
2021-12-21 19:57 ` Richard Henderson
2021-12-21 20:32 ` Richard Henderson
2021-12-21 16:33 ` Paolo Bonzini [this message]
2021-12-21 20:31 ` [PATCH 3/3] meson: cleanup common-user/ build Richard Henderson
2021-12-22 22:05 ` Paolo Bonzini
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=20211221163300.453146-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=lvivier@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).