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

Add lzma dependency.

This commit is contained in:
Matthieu Gautier 2017-02-22 12:30:25 +01:00
parent 843964e55e
commit 77137e0908
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dependencies.py
View File

@ -16,8 +16,6 @@ from utils import Remotefile, pj, SkipCommand
# exist in your "distri" (linux/mac) ? # exist in your "distri" (linux/mac) ?
# If not, we need to compile them here # If not, we need to compile them here
# ************************************* # *************************************
# Zlib
# LZMA
# aria2 # aria2
# Argtable # Argtable
# MSVirtual # MSVirtual
@ -42,6 +40,19 @@ class zlib(Dependency):
return "-DINSTALL_PKGCONFIG_DIR={}".format(pj(self.buildEnv.install_dir, self.buildEnv.libprefix, 'pkgconfig')) return "-DINSTALL_PKGCONFIG_DIR={}".format(pj(self.buildEnv.install_dir, self.buildEnv.libprefix, 'pkgconfig'))
class lzma(Dependency):
name = 'lzma'
version = '5.0.4'
class Source(ReleaseDownload):
archive = Remotefile('xz-5.0.4.tar.bz2',
'5cd9b060d3a1ad396b3be52c9b9311046a1c369e6062aea752658c435629ce92')
class Builder(MakeBuilder):
@property
def configure_option(self):
return "--disable-assembler"
class UUID(Dependency): class UUID(Dependency):
name = 'uuid' name = 'uuid'
version = "1.43.4" version = "1.43.4"
@ -77,7 +88,7 @@ class Xapian(Dependency):
@property @property
def dependencies(self): def dependencies(self):
deps = ['zlib'] deps = ['zlib', 'lzma']
if self.buildEnv.build_target == 'win32': if self.buildEnv.build_target == 'win32':
return deps return deps
return deps + ['UUID'] return deps + ['UUID']
@ -196,7 +207,7 @@ class Zimlib(Dependency):
class Kiwixlib(Dependency): class Kiwixlib(Dependency):
name = "kiwix-lib" name = "kiwix-lib"
dependencies = ['zlib'] dependencies = ['zlib', 'lzma']
@property @property
def dependencies(self): def dependencies(self):

6
kiwix-build.py
View File

@ -84,22 +84,26 @@ PACKAGE_NAME_MAPPERS = {
'pugixml': None, # ['pugixml-devel'] but package doesn't provide pkg-config file 'pugixml': None, # ['pugixml-devel'] but package doesn't provide pkg-config file
'libmicrohttpd': ['libmicrohttpd-devel'], 'libmicrohttpd': ['libmicrohttpd-devel'],
'zlib': ['zlib-devel'], 'zlib': ['zlib-devel'],
'lzma': ['xz-devel'],
'icu4c': None, 'icu4c': None,
'zimlib': None, 'zimlib': None,
}, },
'fedora_native_static': { 'fedora_native_static': {
'COMMON': ['gcc-c++', 'cmake', 'automake', 'glibc-static', 'libstdc++-static', 'ccache'], 'COMMON': ['gcc-c++', 'cmake', 'automake', 'glibc-static', 'libstdc++-static', 'ccache'],
'zlib': ['zlib-devel', 'zlib-static'] 'zlib': ['zlib-devel', 'zlib-static'],
'lzma': ['xz-devel', 'xz-static']
# Either there is no packages, or no static or too old # Either there is no packages, or no static or too old
}, },
'fedora_win32_dyn': { 'fedora_win32_dyn': {
'COMMON': ['mingw32-gcc-c++', 'mingw32-bzip2', 'mingw32-win-iconv', 'mingw32-winpthreads', 'wine', 'ccache'], 'COMMON': ['mingw32-gcc-c++', 'mingw32-bzip2', 'mingw32-win-iconv', 'mingw32-winpthreads', 'wine', 'ccache'],
'zlib': ['mingw32-zlib'], 'zlib': ['mingw32-zlib'],
'lzma': ['mingw32-xz-libs'],
'libmicrohttpd': ['mingw32-libmicrohttpd'], 'libmicrohttpd': ['mingw32-libmicrohttpd'],
}, },
'fedora_win32_static': { 'fedora_win32_static': {
'COMMON': ['mingw32-gcc-c++', 'mingw32-bzip2-static', 'mingw32-win-iconv-static', 'mingw32-winpthreads-static', 'wine', 'ccache'], 'COMMON': ['mingw32-gcc-c++', 'mingw32-bzip2-static', 'mingw32-win-iconv-static', 'mingw32-winpthreads-static', 'wine', 'ccache'],
'zlib': ['mingw32-zlib-static'], 'zlib': ['mingw32-zlib-static'],
'lzma': ['mingw32-xz-libs-static'],
'libmicrohttpd': None, # ['mingw32-libmicrohttpd-static'] packaging dependecy seems buggy, and some static lib are name libfoo.dll.a and 'libmicrohttpd': None, # ['mingw32-libmicrohttpd-static'] packaging dependecy seems buggy, and some static lib are name libfoo.dll.a and
# gcc cannot found them. # gcc cannot found them.
}, },