[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/14] meson: Use find_program() to resolve the entitlement.sh scr
|
From: |
Paolo Bonzini |
|
Subject: |
[PULL 07/14] meson: Use find_program() to resolve the entitlement.sh script |
|
Date: |
Thu, 27 Jan 2022 12:10:30 +0100 |
From: Philippe Mathieu-Daudé via <qemu-devel@nongnu.org>
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>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220122002052.83745-1-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 4429fd2041..c69fbbd0cb 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
- [PULL 00/14] Misc patches for 2022-01-27, Paolo Bonzini, 2022/01/27
- [PULL 12/14] check-block: replace -makecheck with TAP output, Paolo Bonzini, 2022/01/27
- [PULL 06/14] exec/cpu: Make host pages variables / macros 'target agnostic', Paolo Bonzini, 2022/01/27
- [PULL 07/14] meson: Use find_program() to resolve the entitlement.sh script,
Paolo Bonzini <=
- [PULL 04/14] intc: Unexport InterruptStatsProviderClass-related functions, Paolo Bonzini, 2022/01/27
- [PULL 01/14] build-sys: fix a meson deprecation warning, Paolo Bonzini, 2022/01/27
- [PULL 02/14] build-sys: fix undefined ARCH error, Paolo Bonzini, 2022/01/27
- [PULL 10/14] build: make check-block a meson test, Paolo Bonzini, 2022/01/27
- [PULL 13/14] qapi: Cleanup SGX related comments and restore @section-size, Paolo Bonzini, 2022/01/27
- [PULL 05/14] meson.build: Use a function from libfdt 1.5.1 for the library check, Paolo Bonzini, 2022/01/27
- [PULL 11/14] qemu-iotests: require at least an argument to check-block.sh, Paolo Bonzini, 2022/01/27
- [PULL 03/14] docker: add msitools to Fedora/mingw cross, Paolo Bonzini, 2022/01/27
- [PULL 08/14] check-block.sh: passthrough -jN flag of make to -j N flag of check, Paolo Bonzini, 2022/01/27
- [PULL 09/14] scripts/mtest2make: add support for SPEED=thorough, Paolo Bonzini, 2022/01/27