From 8648e8bc27922e63e49896e6965bbeaee850ba7f Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 17 Jun 2024 12:09:12 +0200 Subject: [PATCH] Revert "Do not build libzim with xapian dependency on Windows." This reverts commit 6bfe9ec8b159fa463fa46ccecff8197727e03830. --- kiwixbuild/dependencies/libzim.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kiwixbuild/dependencies/libzim.py b/kiwixbuild/dependencies/libzim.py index 4928c94..a85215c 100644 --- a/kiwixbuild/dependencies/libzim.py +++ b/kiwixbuild/dependencies/libzim.py @@ -23,7 +23,7 @@ class Libzim(Dependency): @classmethod def get_dependencies(cls, configInfo, allDeps): if neutralEnv("distname") == "Windows": - return ["zstd", "icu4c", "zim-testing-suite"] + return ["zstd", "xapian-core", "icu4c", "zim-testing-suite"] deps = ["lzma", "zstd", "xapian-core", "icu4c"] if configInfo.name not in ("flatpak", "wasm"): deps.append("zim-testing-suite") @@ -33,7 +33,6 @@ class Libzim(Dependency): def configure_options(self): configInfo = self.buildEnv.configInfo if neutralEnv("distname") == "Windows": - yield "-Dwith_xapian=false" yield "-Dwerror=false" if configInfo.build == "android": yield "-DUSE_BUFFER_HEADER=false"