From 6933a9263e30e2dbfb36a038660b9387ee632d32 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Sun, 14 Aug 2022 16:28:56 +0000 Subject: dbus-message.c: skip 1.10 layout compatibility test on new architectures These static assertions fail on CHERI-enabled architectures such as Arm Morello, where pointers are 128 bits. Architectures with 128-bit pointers were not supported in DBus 1.10, so we can skip the checks for DBus 1.10 structure layout compatibility for architectures with pointer size > 64 bit. --- meson.build | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 9103bb0e..31c6df51 100644 --- a/meson.build +++ b/meson.build @@ -276,6 +276,8 @@ foreach type : int_types endif endforeach +arch_config.set('DBUS_SIZEOF_VOID_P', cc.sizeof('void *')) + ############################################################################### # Dependencies @@ -1195,6 +1197,7 @@ summary_dict += { '64-bit int': arch_config.get('DBUS_INT64_TYPE'), '32-bit int': arch_config.get('DBUS_INT32_TYPE'), '16-bit int': arch_config.get('DBUS_INT16_TYPE'), + 'pointer size': arch_config.get('DBUS_SIZEOF_VOID_P'), 'xsltproc': xsltproc.found() ? xsltproc.full_path() : '', 'Doxygen': doxygen.found() ? doxygen.full_path() : '', 'ducktype': ducktype.found() ? ducktype.full_path() : '', -- cgit v1.2.1