From 2e081f18d6e3fa7452b76898ad815f8b6e7c1a28 Mon Sep 17 00:00:00 2001 From: igo95862 Date: Sat, 11 Dec 2021 13:59:17 +0300 Subject: [PATCH] Disable exporting D-Bus Introspection XML if cross-compiling This is a soft disable. Passing `dbus-interfaces-dir` build option will with path or 'yes' enable exports again even when cross compiling. (maybe your environment will allow to execute cross compiled binaries) --- meson.build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e77c2aa3ac..d64a3be619 100644 --- a/meson.build +++ b/meson.build @@ -1719,7 +1719,14 @@ public_programs = [] dbus_programs = [] dbus_interfaces_dir = get_option('dbus-interfaces-dir') if dbus_interfaces_dir == '' - dbus_interfaces_dir = get_option('datadir') + '/dbus-1' + if not meson.is_cross_build() + dbus_interfaces_dir = datadir / 'dbus-1' + else + message('D-Bus interfaces export is disabled during cross build. Pass path or yes to force enable.') + dbus_interfaces_dir = 'no' + endif +elif dbus_interfaces_dir == 'yes' + dbus_interfaces_dir = datadir / 'dbus-1' endif basic_includes = include_directories( -- 2.25.1