Don't depend on lzma.

This commit is contained in:
Matthieu Gautier 2024-04-22 15:29:04 +02:00
parent 6bfe9ec8b1
commit 46e58b763d
4 changed files with 6 additions and 7 deletions

View File

@ -14,7 +14,7 @@ class AllBaseDependencies(Dependency):
@classmethod @classmethod
def get_dependencies(cls, configInfo, allDeps): def get_dependencies(cls, configInfo, allDeps):
if neutralEnv("distname") == "Windows": if neutralEnv("distname") == "Windows":
return ["zlib", "lzma", "zstd", "icu4c", "zim-testing-suite"] return ["zlib", "zstd", "icu4c", "zim-testing-suite"]
if configInfo.build == "wasm" or environ.get("OS_NAME") == "manylinux": if configInfo.build == "wasm" or environ.get("OS_NAME") == "manylinux":
return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"] return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"]

View File

@ -18,7 +18,6 @@ class Libkiwix(Dependency):
"pugixml", "pugixml",
"libzim", "libzim",
"zlib", "zlib",
"lzma",
"libcurl", "libcurl",
"libmicrohttpd", "libmicrohttpd",
"icu4c", "icu4c",

View File

@ -1,9 +1,7 @@
from .base import ( from .base import Dependency, GitClone, MesonBuilder
Dependency,
GitClone,
MesonBuilder)
from kiwixbuild._global import option, get_target_step, neutralEnv from kiwixbuild._global import option, get_target_step, neutralEnv
class Libzim(Dependency): class Libzim(Dependency):
name = "libzim" name = "libzim"
force_build = True force_build = True
@ -25,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 ["lzma", "zstd", "icu4c", "zim-testing-suite"] return ["zstd", "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")

View File

@ -27,6 +27,8 @@ class Xapian(Dependency):
@classmethod @classmethod
def get_dependencies(cls, configInfo, allDeps): def get_dependencies(cls, configInfo, allDeps):
if neutralEnv("distname") == "Windows":
return ["zlib"]
deps = ["zlib", "lzma"] deps = ["zlib", "lzma"]
if ( if (
configInfo.build in ("win32", "wasm") configInfo.build in ("win32", "wasm")