[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/21] meson: Resolve the entitlement.sh script once for good
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PULL 13/21] meson: Resolve the entitlement.sh script once for good |
|
Date: |
Tue, 15 Mar 2022 13:53:42 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit 235b523dba ("meson: Use find_program() to resolve the
entitlement.sh script") didn't correctly fixed the issue, as
the script is still resolved for each target. Move the check
earlier, before processing each target.
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Tested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 351f9f4360..6e8fa4ab31 100644
--- a/meson.build
+++ b/meson.build
@@ -3073,6 +3073,10 @@ common_all = static_library('common',
feature_to_c = find_program('scripts/feature_to_c.sh')
+if targetos == 'darwin'
+ entitlement = find_program('scripts/entitlement.sh')
+endif
+
emulators = {}
foreach target : target_dirs
config_target = config_target_mak[target]
@@ -3230,7 +3234,6 @@ 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'],
--
2.34.1
- [PULL 03/21] hvf: Use standard CR0 and CR4 register definitions, (continued)
- [PULL 03/21] hvf: Use standard CR0 and CR4 register definitions, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 04/21] hvf: Make hvf_get_segments() / hvf_put_segments() local, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 05/21] hvf: Remove deprecated hv_vcpu_flush() calls, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 06/21] block/file-posix: Remove a deprecation warning on macOS 12, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 07/21] audio/coreaudio: Remove a deprecation warning on macOS 12, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 08/21] audio/dbus: Fix building with modules on macOS, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 09/21] audio: Log context for audio bug, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 10/21] coreaudio: Always return 0 in handle_voice_change, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 11/21] audio: Rename coreaudio extension to use Objective-C compiler, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 12/21] osdep: Avoid using Clang-specific __builtin_available(), Philippe Mathieu-Daudé, 2022/03/15
- [PULL 13/21] meson: Resolve the entitlement.sh script once for good,
Philippe Mathieu-Daudé <=
- [PULL 14/21] meson: Log QEMU_CXXFLAGS content in summary, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 15/21] configure: Pass filtered QEMU_OBJCFLAGS to meson, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 16/21] ui/cocoa: Constify qkeycode translation arrays, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 17/21] ui/cocoa: add option to disable left-command forwarding to guest, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 18/21] ui/cocoa: release mouse when user switches away from QEMU window, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 19/21] ui/cocoa: capture all keys and combos when mouse is grabbed, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 20/21] ui/cocoa: add option to swap Option and Command, Philippe Mathieu-Daudé, 2022/03/15
- [PULL 21/21] MAINTAINERS: Volunteer to maintain Darwin-based hosts support, Philippe Mathieu-Daudé, 2022/03/15
- Re: [PULL 00/21] Darwin patches for 2022-03-15, Peter Maydell, 2022/03/15