From 242088e98b08e7de1b1d19dee86152390512ad97 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 9 Nov 2025 05:42:18 +0900 Subject: [PATCH 1/2] meson: drop redundant HAVE_ZLIB check ENABLE_IMPORTD requires HAVE_ZLIB, and it is already checked at the very beginning of the file. --- src/import/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/src/import/meson.build b/src/import/meson.build index 3a50d13b0c..baa12bd490 100644 --- a/src/import/meson.build +++ b/src/import/meson.build @@ -101,7 +101,6 @@ executables += [ 'sources' : files('test-qcow2.c'), 'objects' : ['systemd-importd'], 'dependencies' : common_deps, - 'conditions' : ['HAVE_ZLIB'], 'type' : 'manual', }, From 5123d9d38ca6406d93a2aa32841dc5de66de39f9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 9 Nov 2025 09:20:41 +0900 Subject: [PATCH 2/2] meson: refuse to build when gcrypt support is enabled bu libgpg-error not found Follow-up for 066e603ac641e22b1827ce36c9d55311fa44be6e. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 828e66402a..ef1b74b163 100644 --- a/meson.build +++ b/meson.build @@ -1301,7 +1301,7 @@ feature = get_option('gcrypt') libgcrypt = dependency('libgcrypt', required : feature) libgpg_error = dependency('gpg-error', - required : feature.disabled() ? feature : false) + required : feature) have = libgcrypt.found() and libgpg_error.found() if not have