From 8ee7b8987b73c0d4fa1349a55e47f70877aaa160 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 22 Apr 2024 15:29:04 +0200 Subject: [PATCH] Don't depend on lzma. --- kiwixbuild/dependencies/all_dependencies.py | 2 +- kiwixbuild/dependencies/libkiwix.py | 1 - kiwixbuild/dependencies/libzim.py | 8 +++----- kiwixbuild/dependencies/xapian.py | 2 ++ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kiwixbuild/dependencies/all_dependencies.py b/kiwixbuild/dependencies/all_dependencies.py index efaa9ff..e15dd72 100644 --- a/kiwixbuild/dependencies/all_dependencies.py +++ b/kiwixbuild/dependencies/all_dependencies.py @@ -14,7 +14,7 @@ class AllBaseDependencies(Dependency): @classmethod def get_dependencies(cls, configInfo, allDeps): if neutralEnv("distname") == "Windows": - return ["zlib", "lzma", "zstd", "icu4c"] + return ["zlib", "zstd", "icu4c"] if configInfo.build == "wasm" or environ.get("OS_NAME") == "bionic": return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"] diff --git a/kiwixbuild/dependencies/libkiwix.py b/kiwixbuild/dependencies/libkiwix.py index 573cb23..66c7a59 100644 --- a/kiwixbuild/dependencies/libkiwix.py +++ b/kiwixbuild/dependencies/libkiwix.py @@ -18,7 +18,6 @@ class Libkiwix(Dependency): "pugixml", "libzim", "zlib", - "lzma", "libcurl", "libmicrohttpd", "icu4c", diff --git a/kiwixbuild/dependencies/libzim.py b/kiwixbuild/dependencies/libzim.py index 3df7292..67981d4 100644 --- a/kiwixbuild/dependencies/libzim.py +++ b/kiwixbuild/dependencies/libzim.py @@ -1,9 +1,7 @@ -from .base import ( - Dependency, - GitClone, - MesonBuilder) +from .base import Dependency, GitClone, MesonBuilder from kiwixbuild._global import option, get_target_step, neutralEnv + class Libzim(Dependency): name = "libzim" force_build = True @@ -25,7 +23,7 @@ class Libzim(Dependency): @classmethod def get_dependencies(cls, configInfo, allDeps): if neutralEnv("distname") == "Windows": - return ["lzma", "zstd", "icu4c"] + return ["zstd", "icu4c"] deps = ["lzma", "zstd", "xapian-core", "icu4c"] if configInfo.name not in ("flatpak", "wasm"): deps.append("zim-testing-suite") diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py index aac4fd7..252d2c2 100644 --- a/kiwixbuild/dependencies/xapian.py +++ b/kiwixbuild/dependencies/xapian.py @@ -27,6 +27,8 @@ class Xapian(Dependency): @classmethod def get_dependencies(cls, configInfo, allDeps): + if neutralEnv("distname") == "Windows": + return ["zlib"] deps = ["zlib", "lzma"] if ( configInfo.build in ("win32", "wasm")