From f1cd66ceeb6127c6c9f3f54dec0178c4bbbfffba Mon Sep 17 00:00:00 2001 From: Broc Going Date: Fri, 24 Apr 2026 09:43:24 -0700 Subject: [PATCH] json: Enables json printing and ocp plugin without fabrics Enables non fabrics-specific json functionality like printing and the ocp plugin when json-c is available, even if fabrics is disabled. Only nvme/json.c functionality is excluded when fabrics is disabled. Signed-off-by: Broc Going --- libnvme/src/meson.build | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnvme/src/meson.build b/libnvme/src/meson.build index 2099222c1c..e4dc570e36 100644 --- a/libnvme/src/meson.build +++ b/libnvme/src/meson.build @@ -79,7 +79,7 @@ else sources += 'nvme/no-uring.c' endif -if json_c_dep.found() +if json_c_dep.found() and want_fabrics sources += 'nvme/json.c' else sources += 'nvme/no-json.c' diff --git a/meson.build b/meson.build index 45f7f932fe..adc8ece7fd 100644 --- a/meson.build +++ b/meson.build @@ -54,7 +54,7 @@ want_nvme = get_option('nvme').disabled() == false want_libnvme = get_option('libnvme').disabled() == false want_fabrics = get_option('fabrics').disabled() == false and host_system != 'windows' want_mi = get_option('mi').disabled() == false and host_system != 'windows' -want_json_c = get_option('json-c').disabled() == false and want_fabrics +want_json_c = get_option('json-c').disabled() == false want_libkmod = get_option('libkmod').disabled() == false and host_system != 'windows' want_tests = get_option('tests') and host_system != 'windows' want_examples = get_option('examples') and host_system != 'windows'