smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not build libzim with xapian dependency on Windows." 

This reverts commit 6bfe9ec8b1.
This commit is contained in:
Matthieu Gautier 2024-06-17 12:09:12 +02:00
parent 9931bb690a
commit 8648e8bc27
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kiwixbuild/dependencies/libzim.py
View File

@ -23,7 +23,7 @@ class Libzim(Dependency):
@classmethod @classmethod
def get_dependencies(cls, configInfo, allDeps): def get_dependencies(cls, configInfo, allDeps):
if neutralEnv("distname") == "Windows": if neutralEnv("distname") == "Windows":
return ["zstd", "icu4c", "zim-testing-suite"] return ["zstd", "xapian-core", "icu4c", "zim-testing-suite"]
deps = ["lzma", "zstd", "xapian-core", "icu4c"] deps = ["lzma", "zstd", "xapian-core", "icu4c"]
if configInfo.name not in ("flatpak", "wasm"): if configInfo.name not in ("flatpak", "wasm"):
deps.append("zim-testing-suite") deps.append("zim-testing-suite")
@ -33,7 +33,6 @@ class Libzim(Dependency):
def configure_options(self): def configure_options(self):
configInfo = self.buildEnv.configInfo configInfo = self.buildEnv.configInfo
if neutralEnv("distname") == "Windows": if neutralEnv("distname") == "Windows":
yield "-Dwith_xapian=false"
yield "-Dwerror=false" yield "-Dwerror=false"
if configInfo.build == "android": if configInfo.build == "android":
yield "-DUSE_BUFFER_HEADER=false" yield "-DUSE_BUFFER_HEADER=false"