From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Akihiko Odaki" <akihiko.odaki@daynix.com>,
qemu-stable@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 40/58] meson: Use osdep_prefix for strchrnul()
Date: Fri, 25 Apr 2025 17:28:24 +0200 [thread overview]
Message-ID: <20250425152843.69638-41-philmd@linaro.org> (raw)
In-Reply-To: <20250425152843.69638-1-philmd@linaro.org>
From: Akihiko Odaki <akihiko.odaki@daynix.com>
macOS SDK may have the symbol of strchrnul(), but it is actually
available only on macOS 15.4 or later and that fact is codified in
string.h. Include the header file using osdep_prefix to check if the
function is available on the deployment target.
Cc: qemu-stable@nongnu.org
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250424-buildsys-v1-4-97655e3b25d7@daynix.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index d93dbde194f..c736a6f4c4b 100644
--- a/meson.build
+++ b/meson.build
@@ -2193,6 +2193,7 @@ osdep_prefix = '''
#include <stddef.h>
#include <sys/types.h>
+ #include <string.h>
#include <limits.h>
/* Put unistd.h before time.h as that triggers localtime_r/gmtime_r
* function availability on recentish Mingw-w64 platforms. */
@@ -2657,7 +2658,7 @@ config_host_data.set('HAVE_GETIFADDRS', cc.has_function('getifaddrs'))
config_host_data.set('HAVE_GLIB_WITH_SLICE_ALLOCATOR', glib_has_gslice)
config_host_data.set('HAVE_GLIB_WITH_ALIGNED_ALLOC', glib_has_aligned_alloc)
config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util))
-config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul'))
+config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul', prefix: osdep_prefix))
config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>'))
if rbd.found()
config_host_data.set('HAVE_RBD_NAMESPACE_EXISTS',
--
2.47.1
next prev parent reply other threads:[~2025-04-25 15:40 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-25 15:27 [PULL 00/58] Misc single binary patches for 2025-04-25 Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 01/58] target/hexagon: Explode MO_TExx -> MO_TE | MO_xx Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 02/58] target/hexagon: Replace MO_TE -> MO_LE Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 03/58] target/i386: Replace MO_TE* -> MO_LE* Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 04/58] cpus: Introduce CPUClass::list_cpus() callback Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 05/58] target/i386: Register CPUClass:list_cpus Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 06/58] target/ppc: " Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 07/58] target/sparc: " Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 08/58] target/s390x: " Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 09/58] cpus: Remove #ifdef check on cpu_list definition Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 10/58] hw/pci-host/designware: Use deposit/extract API Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 11/58] hw/misc/edu: Convert type_init() -> DEFINE_TYPES() Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 12/58] qom: Have class_base_init() take a const data argument Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 14/58] qom: Constify TypeInfo::class_data Philippe Mathieu-Daudé
2025-04-25 15:27 ` [PULL 15/58] qom: Constify TypeInfo::interfaces Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 16/58] qom: Make InterfaceInfo[] uses const Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 17/58] qom/object: Fix type conflict of GLib function pointers Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 18/58] hw/core: Get default_cpu_type calling machine_class_default_cpu_type() Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 19/58] hw/core/cpu: gdb_arch_name string should not be freed Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 20/58] gdbstub: Allow gdb_core_xml_file to be set at runtime Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 21/58] target/arm: Handle AArch64 in TYPE_ARM_CPU gdb_arch_name Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 22/58] target/arm: Handle gdb_core_xml_file in TYPE_ARM_CPU Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 23/58] target/arm: Handle AArch64 gdb read/write regs " Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 24/58] target/arm: Replace target_ulong -> hwaddr in ARMMMUFaultInfo Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 25/58] target/arm: Replace target_ulong -> vaddr for CPUWatchpoint Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 26/58] target/mips: Fix MIPS16e translation Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 27/58] exec: Rename target_words_bigendian() -> target_big_endian() Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 28/58] hw/usb/hcd-xhci: Unmap canceled packet Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 29/58] hw/intc/i8259: Remove unused DEBUG_PIC define Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 30/58] hw/core/loader: Fix type conflict of GLib function pointers Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 31/58] hw/net/can: " Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 32/58] contrib/plugins: " Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 33/58] system/vl: " Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 34/58] system/memory: Remove DEVICE_HOST_ENDIAN definition Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 35/58] system/datadir: Add new type constant for DTB files Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 36/58] pc-bios: Move device tree files in their own subdir Philippe Mathieu-Daudé
2025-05-29 18:18 ` Bernhard Beschow
2025-05-30 0:54 ` BALATON Zoltan
2025-06-02 8:12 ` Philippe Mathieu-Daudé
2025-06-02 11:56 ` BALATON Zoltan
2025-06-03 11:25 ` Philippe Mathieu-Daudé
2025-06-03 6:39 ` Bernhard Beschow
2025-06-03 11:38 ` Thomas Huth
2025-06-04 9:59 ` Bernhard Beschow
2025-06-10 20:54 ` Bernhard Beschow
2025-06-03 12:58 ` BALATON Zoltan
2025-04-25 15:28 ` [PULL 37/58] meson: Use has_header_symbol() to check getcpu() Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 38/58] meson: Remove CONFIG_STATX and CONFIG_STATX_MNT_ID Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 39/58] meson: Share common C source prefixes Philippe Mathieu-Daudé
2025-04-25 15:28 ` Philippe Mathieu-Daudé [this message]
2025-04-25 15:28 ` [PULL 41/58] system/kvm: make functions accessible from common code Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 42/58] accel/tcg: Correct list of included headers in tcg-stub.c Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 43/58] target/hexagon: Include missing 'accel/tcg/getpc.h' Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 44/58] linux-user/elfload: Use target_needs_bswap() Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 45/58] accel/kvm: " Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 46/58] target/mips: Check CPU endianness at runtime using env_is_bigendian() Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 47/58] target/xtensa: Evaluate TARGET_BIG_ENDIAN at compile time Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 48/58] hw/mips: " Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 49/58] hw/microblaze: " Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 50/58] qapi: Rename TargetInfo structure as QemuTargetInfo Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 51/58] qemu: Introduce target_cpu_type() Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 52/58] cpus: Replace CPU_RESOLVING_TYPE -> target_cpu_type() Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 53/58] cpus: Move target-agnostic methods out of cpu-target.c Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 54/58] accel: Implement accel_init_ops_interfaces() for both system/user mode Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 55/58] accel: Include missing 'qemu/accel.h' header in accel-internal.h Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 56/58] accel: Make AccelCPUClass structure target-agnostic Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 57/58] accel: Move target-agnostic code from accel-target.c -> accel-common.c Philippe Mathieu-Daudé
2025-04-25 15:28 ` [PULL 58/58] qemu: Convert target_name() to TargetInfo API Philippe Mathieu-Daudé
2025-04-28 17:56 ` [PULL 00/58] Misc single binary patches for 2025-04-25 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250425152843.69638-41-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=akihiko.odaki@daynix.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).