* [PATCH] meson: Use find_program() to resolve the entitlement.sh script
@ 2022-01-22 0:20 Philippe Mathieu-Daudé via
2022-01-24 8:16 ` Richard Henderson
0 siblings, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-22 0:20 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Akihiko Odaki, Philippe Mathieu-Daudé
Using ../configure without any particular option generates 31 targets
on Darwin, and meson search for the entitlement.sh script 31 times:
Program nm found: YES
Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
Configuring 50-edk2-i386-secure.json using configuration
Configuring 50-edk2-x86_64-secure.json using configuration
Use find_program() which seems to cache the script path once found.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 833fd6bc4c..355f4c1acf 100644
--- a/meson.build
+++ b/meson.build
@@ -3052,17 +3052,14 @@ foreach target : target_dirs
install_input += meson.current_source_dir() / entitlements
endif
+ entitlement = find_program('scripts/entitlement.sh')
emulators += {exe['name'] : custom_target(exe['name'],
input: build_input,
output: exe['name'],
- command: [
- files('scripts/entitlement.sh'),
- '@OUTPUT@',
- '@INPUT@'
- ])
+ command: [entitlement, '@OUTPUT@', '@INPUT@'])
}
- meson.add_install_script('scripts/entitlement.sh', '--install',
+ meson.add_install_script(entitlement, '--install',
get_option('bindir') / exe['name'],
install_input)
else
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] meson: Use find_program() to resolve the entitlement.sh script
2022-01-22 0:20 [PATCH] meson: Use find_program() to resolve the entitlement.sh script Philippe Mathieu-Daudé via
@ 2022-01-24 8:16 ` Richard Henderson
2022-01-24 9:04 ` Akihiko Odaki
0 siblings, 1 reply; 4+ messages in thread
From: Richard Henderson @ 2022-01-24 8:16 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Paolo Bonzini, Akihiko Odaki
On 1/22/22 11:20 AM, Philippe Mathieu-Daudé via wrote:
> Using ../configure without any particular option generates 31 targets
> on Darwin, and meson search for the entitlement.sh script 31 times:
>
> Program nm found: YES
> Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
> Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> Configuring 50-edk2-i386-secure.json using configuration
> Configuring 50-edk2-x86_64-secure.json using configuration
>
> Use find_program() which seems to cache the script path once found.
>
> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
> ---
> meson.build | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] meson: Use find_program() to resolve the entitlement.sh script
2022-01-24 8:16 ` Richard Henderson
@ 2022-01-24 9:04 ` Akihiko Odaki
2022-01-24 13:41 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Akihiko Odaki @ 2022-01-24 9:04 UTC (permalink / raw)
To: Richard Henderson
Cc: Paolo Bonzini, Philippe Mathieu-Daudé, qemu Developers
On Mon, Jan 24, 2022 at 5:16 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 1/22/22 11:20 AM, Philippe Mathieu-Daudé via wrote:
> > Using ../configure without any particular option generates 31 targets
> > on Darwin, and meson search for the entitlement.sh script 31 times:
> >
> > Program nm found: YES
> > Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
> > Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
> > Configuring 50-edk2-i386-secure.json using configuration
> > Configuring 50-edk2-x86_64-secure.json using configuration
> >
> > Use find_program() which seems to cache the script path once found.
> >
> > Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
> > ---
> > meson.build | 9 +++------
> > 1 file changed, 3 insertions(+), 6 deletions(-)
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>
> r~
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] meson: Use find_program() to resolve the entitlement.sh script
2022-01-24 9:04 ` Akihiko Odaki
@ 2022-01-24 13:41 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2022-01-24 13:41 UTC (permalink / raw)
To: Akihiko Odaki, Richard Henderson
Cc: Philippe Mathieu-Daudé, qemu Developers
On 1/24/22 10:04, Akihiko Odaki wrote:
> On Mon, Jan 24, 2022 at 5:16 PM Richard Henderson
> <richard.henderson@linaro.org> wrote:
>>
>> On 1/22/22 11:20 AM, Philippe Mathieu-Daudé via wrote:
>>> Using ../configure without any particular option generates 31 targets
>>> on Darwin, and meson search for the entitlement.sh script 31 times:
>>>
>>> Program nm found: YES
>>> Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
>>> Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/feature_to_c.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
>>> Configuring 50-edk2-i386-secure.json using configuration
>>> Configuring 50-edk2-x86_64-secure.json using configuration
>>>
>>> Use find_program() which seems to cache the script path once found.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
>>> ---
>>> meson.build | 9 +++------
>>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>>
>> r~
>
> Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
>
Queued, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-24 13:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-22 0:20 [PATCH] meson: Use find_program() to resolve the entitlement.sh script Philippe Mathieu-Daudé via
2022-01-24 8:16 ` Richard Henderson
2022-01-24 9:04 ` Akihiko Odaki
2022-01-24 13:41 ` Paolo Bonzini
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).