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 <dwagner@suse.de>

diff --git a/meson.build b/meson.build
index 674ef4b0a1e43831e629c00fe658124b73c8bb5b..e8cfe66583df675c7bad3ca01f779a731d47ab16 100644 (file)
--- 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 cb2e1fa797861bc024f237e3c0d73b24de204a61..2c093ca867629a432c83bce48c50101c2c34de86 100644 (file)
--- 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 (file)
index 0000000..95ad3af
--- /dev/null
+++ b/subprojects/dbus.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+url = https://gitlab.freedesktop.org/dbus/dbus.git
+revision = 218b35a57cdeab667c75d6ef34f901b8ead00056
+depth = 1