From: Daniel Wagner <dwagner@suse.de>
Date: Fri, 10 Feb 2023 13:56:20 +0000 (+0100)
Subject: build: Set defaults for libdbus to disabled
X-Git-Tag: v1.4~37^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=30ed5282432476ec9701c20fc89d68cdcfa9f8bf;p=users%2Fsagi%2Flibnvme.git

build: Set defaults for libdbus to disabled

People are unhappy with the defaults of libdbus being auto. It pulls in
the extra dependency for little gain. So let's set it to disabled which
is for most developers the right choice anyway.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
index 340cff38..2c8f02b0 100644
--- a/.github/workflows/meson.yml
+++ b/.github/workflows/meson.yml
@@ -20,7 +20,7 @@ jobs:
           python-version: '3.x'
       - uses: BSFishy/meson-build@v1.0.3
         with:
-          setup-options: --werror
+          setup-options: --werror -Dlibdbus=enabled
           options: --verbose
           action: test
       # Preserve meson's log file on failure
@@ -131,7 +131,7 @@ jobs:
           python-version: '3.x'
       - uses: BSFishy/meson-build@v1.0.3
         with:
-          setup-options: --wrap-mode=forcefallback
+          setup-options: --wrap-mode=forcefallback -Dlibdbus=enabled
           options: --verbose
           action: test
           meson-version: 0.61.2
@@ -153,7 +153,7 @@ jobs:
           python-version: '3.x'
       - uses: BSFishy/meson-build@v1.0.3
         with:
-          setup-options: --wrap-mode=forcefallback --default-library=static
+          setup-options: --wrap-mode=forcefallback --default-library=static -Dlibdbus=enabled
           options: --verbose
           action: test
           meson-version: 0.61.2
@@ -175,7 +175,7 @@ jobs:
           python-version: '3.x'
       - uses: BSFishy/meson-build@v1.0.3
         with:
-          setup-options: --wrap-mode=forcefallback --cross-file=.github/cross/ubuntu-static.txt --default-library=static
+          setup-options: --wrap-mode=forcefallback --cross-file=.github/cross/ubuntu-static.txt --default-library=static -Dlibdbus=enabled
           options: --verbose
           action: test
           meson-version: 0.61.2
diff --git a/meson_options.txt b/meson_options.txt
index f471a885..04a9ab54 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,5 +9,5 @@ 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')
+option('libdbus', type : 'feature', value: 'disabled', description : 'libdbus support')
 option('json-c', type : 'feature', value: 'auto', description : 'JSON support')