From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [PATCH 1/6] meson: pick libfdt from common_ss when building target-specific files
Date: Wed, 8 May 2024 10:24:24 +0200 [thread overview]
Message-ID: <67c7f49f-cc1a-40d4-8b30-63d6b3408a1a@linaro.org> (raw)
In-Reply-To: <20240508075105.15510-2-pbonzini@redhat.com>
On 8/5/24 09:51, Paolo Bonzini wrote:
> Avoid having to list dependencies such as libfdt twice, both on common_ss
> and specific_ss. Instead, just take all the dependencies in common_ss
> and allow the target-specific libqemu-*.fa library to use them.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> meson.build | 14 +++++++++++---
> hw/arm/meson.build | 2 +-
> hw/loongarch/meson.build | 2 +-
> hw/mips/meson.build | 2 +-
> hw/openrisc/meson.build | 4 ++--
> hw/ppc/meson.build | 4 +---
> hw/riscv/meson.build | 2 +-
> 7 files changed, 18 insertions(+), 12 deletions(-)
> target_common = common_ss.apply(config_target, strict: false)
> objects = common_all.extract_objects(target_common.sources())
> - deps = target_common.dependencies()
> + arch_deps += target_common.dependencies()
>
> target_specific = specific_ss.apply(config_target, strict: false)
> arch_srcs += target_specific.sources()
> arch_deps += target_specific.dependencies()
>
> + # allow using headers from the dependencies but do not include the sources,
> + # because this emulator only needs those in "objects". For external
> + # dependencies, the full dependency is included below in the executable.
> + lib_deps = []
> + foreach dep : arch_deps
> + lib_deps += dep.partial_dependency(compile_args: true, includes: true)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> + endforeach
> +
> lib = static_library('qemu-' + target,
> sources: arch_srcs + genh,
> - dependencies: arch_deps,
> + dependencies: lib_deps,
> objects: objects,
> include_directories: target_inc,
> c_args: c_args,
> @@ -3924,7 +3932,7 @@ foreach target : target_dirs
> emulator = executable(exe_name, exe['sources'],
> install: true,
> c_args: c_args,
> - dependencies: arch_deps + deps + exe['dependencies'],
> + dependencies: arch_deps + exe['dependencies'],
next prev parent reply other threads:[~2024-05-08 8:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 7:50 [PATCH v2 0/6] kconfig: express dependency of individual boards on libfdt Paolo Bonzini
2024-05-08 7:51 ` [PATCH 1/6] meson: pick libfdt from common_ss when building target-specific files Paolo Bonzini
2024-05-08 8:24 ` Philippe Mathieu-Daudé [this message]
2024-05-08 7:51 ` [PATCH 2/6] meson: move libfdt together with other dependencies Paolo Bonzini
2024-05-08 8:21 ` Philippe Mathieu-Daudé
2024-05-08 7:51 ` [PATCH 3/6] kconfig: allow compiling out QEMU device tree code per target Paolo Bonzini
2024-05-08 7:51 ` [PATCH 4/6] kconfig: express dependency of individual boards on libfdt Paolo Bonzini
2024-05-08 7:51 ` [PATCH 5/6] hw/xtensa: require libfdt Paolo Bonzini
2024-05-08 7:51 ` [PATCH 6/6] configs: disable emulators that require it if libfdt is not found 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=67c7f49f-cc1a-40d4-8b30-63d6b3408a1a@linaro.org \
--to=philmd@linaro.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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 read-only IMAP folder(s) and NNTP newsgroup(s).