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

Fix dependency detection for zim-tools.

This commit is contained in:
Matthieu Gautier 2020-07-15 15:51:09 +02:00
parent da31dd428e
commit 39a93b07b3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiwixbuild/dependencies/all_dependencies.py
View File

@ -13,12 +13,12 @@ class AllBaseDependencies(Dependency):
@classmethod
def get_dependencies(cls, platformInfo, allDeps):
base_deps = ['zlib', 'lzma', 'zstd', 'xapian-core', 'pugixml', 'libcurl', 'icu4c', 'mustache', 'libmicrohttpd']
# zimwriterfs from zim-tools
if platformInfo.build not in ('android', 'win32'):
base_deps += ['libmagic', 'gumbo']
# zimtools
# We do not build zimtools at all on "android" and "iOS"
if platformInfo.build not in ('android', 'iOS'):
base_deps += ['docoptcpp']
if platformInfo.build != 'win32':
# zimwriterfs
base_deps += ['libmagic', 'gumbo']
return base_deps

10
kiwixbuild/dependencies/zim_tools.py
View File

@ -12,12 +12,18 @@ class ZimTools(Dependency):
git_dir = "zim-tools"
class Builder(MesonBuilder):
dependencies = ['libzim', 'docoptcpp']
@classmethod
def get_dependencies(cls, platformInfo, allDeps):
base_deps = ['libzim', 'docoptcpp']
if platformInfo.build != 'win32':
base_deps += ['libmagic', 'gumbo']
return base_deps
@property
def configure_option(self):
base_option = ""
if self.buildEnv.platformInfo.build not in ('android', 'win32'):
# We don't build zimwriterfs on win32, and so we don't have magic
if self.buildEnv.platformInfo.build != 'win32':
base_option += " -Dmagic-install-prefix={buildEnv.install_dir}"
if self.buildEnv.platformInfo.static:
base_option += " -Dstatic-linkage=true"