[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 14/22] meson: Resolve the entitlement.sh script once for good
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v7 14/22] meson: Resolve the entitlement.sh script once for good |
Date: |
Mon, 7 Mar 2022 00:17:45 +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.
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 b6e30d7463..8ca2b7c8c2 100644
--- a/meson.build
+++ b/meson.build
@@ -3063,6 +3063,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]
@@ -3220,7 +3224,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
- Re: [PATCH v7 06/22] hvf: Fix OOB write in RDTSCP instruction decode, (continued)
[PATCH v7 07/22] block/file-posix: Remove a deprecation warning on macOS 12, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 08/22] audio/coreaudio: Remove a deprecation warning on macOS 12, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 09/22] audio/dbus: Fix building with modules on macOS, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 10/22] audio: Log context for audio bug, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 11/22] coreaudio: Always return 0 in handle_voice_change, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 12/22] audio: Rename coreaudio extension to use Objective-C compiler, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 13/22] osdep: Avoid using Clang-specific __builtin_available(), Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 14/22] meson: Resolve the entitlement.sh script once for good,
Philippe Mathieu-Daudé <=
[PATCH v7 15/22] meson: Log QEMU_CXXFLAGS content in summary, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 16/22] configure: Pass filtered QEMU_OBJCFLAGS to meson, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 17/22] ui/cocoa: Constify qkeycode translation arrays, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 18/22] ui/cocoa: add option to disable left-command forwarding to guest, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 19/22] ui/cocoa: release mouse when user switches away from QEMU window, Philippe Mathieu-Daudé, 2022/03/06
[PATCH v7 20/22] ui/cocoa: capture all keys and combos when mouse is grabbed, Philippe Mathieu-Daudé, 2022/03/06