From df62bfb1acce25b105bdb17f5fb06f776c723df5 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 23 Nov 2022 14:01:53 +0100 Subject: [PATCH] build: Add D-Bus fallback Add a wrap for D-Bus so we can use it as fallback for static builds. Signed-off-by: Daniel Wagner --- meson.build | 20 ++++++++++++++++++-- meson_options.txt | 1 + subprojects/dbus.wrap | 4 ++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 subprojects/dbus.wrap diff --git a/meson.build b/meson.build index 674ef4b0..e8cfe665 100644 --- a/meson.build +++ b/meson.build @@ -89,8 +89,24 @@ if openssl_dep.found() description: 'OpenSSL/LibreSSL API version @0@'.format(api_version)) endif -# Check for libdus availability. Optional, only required for MCTP dbus scan -libdbus_dep = dependency('dbus-1', required: false) +if get_option('libdbus').disabled() + libdbus_dep = dependency('', required: false) +else + # Check for libdus availability. Optional, only required for MCTP dbus scan + libdbus_dep = dependency( + 'dbus-1', + required: true, + fallback: ['dbus', 'libdbus_dep'], + default_options: [ + 'default_library=static', + 'embedded_tests=false', + 'message_bus=false', + 'modular_tests=disabled', + 'tools=false', + ], + ) +endif + conf.set('CONFIG_DBUS', libdbus_dep.found(), description: 'Enable dbus support?') # local (cross-compilable) implementations of ccan configure steps diff --git a/meson_options.txt b/meson_options.txt index cb2e1fa7..2c093ca8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,3 +9,4 @@ option('docs-build', type : 'boolean', value : false, description : 'build docu option('python', type : 'combo', choices : ['auto', 'true', 'false'], description : 'Generate libnvme python bindings') option('openssl', type : 'feature', value: 'auto', description : 'OpenSSL support') +option('libdbus', type : 'feature', value: 'auto', description : 'libdbus support') diff --git a/subprojects/dbus.wrap b/subprojects/dbus.wrap new file mode 100644 index 00000000..95ad3af2 --- /dev/null +++ b/subprojects/dbus.wrap @@ -0,0 +1,4 @@ +[wrap-git] +url = https://gitlab.freedesktop.org/dbus/dbus.git +revision = 218b35a57cdeab667c75d6ef34f901b8ead00056 +depth = 1 -- 2.50.1