From: igo95862 Date: Sat, 11 Dec 2021 10:59:17 +0000 (+0300) Subject: Disable exporting D-Bus Introspection XML if cross-compiling X-Git-Tag: v250-rc3~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e081f18d6e3fa7452b76898ad815f8b6e7c1a28;p=thirdparty%2Fsystemd.git 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) --- diff --git a/meson.build b/meson.build index e77c2aa3ac0..d64a3be6191 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(