From ffd7e590dbe23d1da4dac786a303d6a12c7f657a Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Thu, 16 Apr 2026 14:22:19 +0200 Subject: [PATCH 1/2] build: drop windows guard on no-json Remove the windows guard for no-json after the header file cleanup. Signed-off-by: Daniel Wagner --- libnvme/src/meson.build | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libnvme/src/meson.build b/libnvme/src/meson.build index d227ed4644..c95a911c83 100644 --- a/libnvme/src/meson.build +++ b/libnvme/src/meson.build @@ -77,12 +77,10 @@ else sources += 'nvme/no-uring.c' endif -if host_system != 'windows' - if json_c_dep.found() - sources += 'nvme/json.c' - else - sources += 'nvme/no-json.c' - endif +if json_c_dep.found() + sources += 'nvme/json.c' +else + sources += 'nvme/no-json.c' endif deps = [ From f73aeb39b389fc07b3ec5611fd11810572f025ce Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Thu, 16 Apr 2026 14:31:57 +0200 Subject: [PATCH 2/2] build: handle libdbus and liburing dependencies generically The libdbus and liburing dependencies are handled in the top-level meson.build file, where they are excluded from the Windows build. Thus, there is no need to special-case them. Signed-off-by: Daniel Wagner --- libnvme/src/meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libnvme/src/meson.build b/libnvme/src/meson.build index c95a911c83..6c0c1cb311 100644 --- a/libnvme/src/meson.build +++ b/libnvme/src/meson.build @@ -84,21 +84,18 @@ else endif deps = [ - config_dep, ccan_dep, + config_dep, json_c_dep, keyutils_dep, + libdbus_dep, + liburing_dep, openssl_dep, ] if host_system == 'windows' deps += [ kernel32_dep ] -else - deps += [ - libdbus_dep, - liburing_dep, - ] endif nvme_ld = meson.current_source_dir() / 'libnvme.ld'