meson: Use find_program() to resolve the entitlement.sh script
PATCH 1/1 meson: Use find_program() to resolve the entitlement.sh script
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/[email protected]/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.
--- meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
meson.build +3 -6
@@ -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
Signature · 1 line
2.34.1
Quoted 40 lines · Philippe Mathieu-Daudé via
Using ../configure without any particular option generates 31 targets on Darwin, and meson search for the
entitlement.shscript 31 times:Program nm found: YES
Programscripts/undefsym.pyfound: YES (/opt/homebrew/opt/[email protected]/bin/python3.9/Code/qemu/scripts/undefsym.py) Programscripts/feature_to_c.shfound: YES (/bin/sh/Code/qemu/scripts/feature_to_c.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Configuring 50-edk2-i386-secure.json using configuration
Configuring 50-edk2-x86_64-secure.json using configuration
Quoted 6 lines
Use
find_program()which seems to cache the script path once found.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
r~
Akihiko Odaki
Reviewed-byQuoted 44 lines · Richard Henderson
Quoted 42 lines · Philippe Mathieu-Daudé via
Using ../configure without any particular option generates 31 targets on Darwin, and meson search for the
entitlement.shscript 31 times:Program nm found: YES
Programscripts/undefsym.pyfound: YES (/opt/homebrew/opt/[email protected]/bin/python3.9/Code/qemu/scripts/undefsym.py) Programscripts/feature_to_c.shfound: YES (/bin/sh/Code/qemu/scripts/feature_to_c.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Configuring 50-edk2-i386-secure.json using configuration
Configuring 50-edk2-x86_64-secure.json using configurationUse
find_program()which seems to cache the script path once found.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)Reviewed-by Richard Henderson <[email protected]>r~
Paolo Bonzini
AppliedQuoted 51 lines · Akihiko Odaki
Quoted 49 lines · Richard Henderson
Quoted 46 lines · Philippe Mathieu-Daudé via
Using ../configure without any particular option generates 31 targets on Darwin, and meson search for the
entitlement.shscript 31 times:Program nm found: YES
Programscripts/undefsym.pyfound: YES (/opt/homebrew/opt/[email protected]/bin/python3.9/Code/qemu/scripts/undefsym.py) Programscripts/feature_to_c.shfound: YES (/bin/sh/Code/qemu/scripts/feature_to_c.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Programscripts/entitlement.shfound: YES (/Code/qemu/scripts/entitlement.sh)
Configuring 50-edk2-i386-secure.json using configuration
Configuring 50-edk2-x86_64-secure.json using configurationUse
find_program()which seems to cache the script path once found.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
Quoted 6 lines
Quoted 3 lines
Reviewed-by Richard Henderson <[email protected]>r~
Reviewed-by Akihiko Odaki <[email protected]>
Queued, thanks.