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

Merge pull request #24 from kiwix/search_in_libzim 

Update dependencies tree.

This PR fails on travis but it is because of fix waiting to be merged in libzim.
But for the libzim PR to be validated by travis, we need to generate the libzim's dependencies archives here. But as master is broken, we do not generate the dependencies..

I've tested the two fixes together and it is working. So I merge this PR to solve this deadlock
This commit is contained in:
Matthieu Gautier 2017-04-12 02:24:28 +02:00 committed by GitHub
parent 1494adc943 57ac912824
commit 21abfd97de
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dependencies.py
View File

@ -232,7 +232,14 @@ class Icu_cross_compile(Icu):
class Libzim(Dependency): class Libzim(Dependency):
name = "libzim" name = "libzim"
dependencies = ['zlib', 'lzma']
@property
def dependencies(self):
base_dependencies = ['zlib', 'lzma', 'xapian-core']
if self.buildEnv.platform_info.build != 'native':
return base_dependencies + ["icu4c_cross-compile"]
else:
return base_dependencies + ["icu4c"]
class Source(GitClone): class Source(GitClone):
git_remote = "https://github.com/openzim/libzim.git" git_remote = "https://github.com/openzim/libzim.git"
@ -270,7 +277,7 @@ class Kiwixlib(Dependency):
@property @property
def dependencies(self): def dependencies(self):
base_dependencies = ["xapian-core", "pugixml", "libzim", "zlib", "lzma"] base_dependencies = ["pugixml", "libzim", "zlib", "lzma"]
if self.buildEnv.platform_info.build != 'android': if self.buildEnv.platform_info.build != 'android':
base_dependencies += ['ctpp2'] base_dependencies += ['ctpp2']
if self.buildEnv.platform_info.build != 'native': if self.buildEnv.platform_info.build != 'native':

10
kiwix-build.py
View File

@ -29,6 +29,7 @@ CROSS_ENV = {
'toolchain_names': ['mingw32_toolchain'], 'toolchain_names': ['mingw32_toolchain'],
'root_path': '/usr/i686-w64-mingw32/sys-root/mingw', 'root_path': '/usr/i686-w64-mingw32/sys-root/mingw',
'extra_libs': ['-lwinmm', '-lws2_32', '-lshlwapi', '-lrpcrt4', '-lmsvcr90'], 'extra_libs': ['-lwinmm', '-lws2_32', '-lshlwapi', '-lrpcrt4', '-lmsvcr90'],
'extra_cflags': ['-DWIN32'],
'host_machine': { 'host_machine': {
'system': 'windows', 'system': 'windows',
'cpu_family': 'x86', 'cpu_family': 'x86',
@ -39,6 +40,7 @@ CROSS_ENV = {
'fedora_android': { 'fedora_android': {
'toolchain_names': ['android_ndk'], 'toolchain_names': ['android_ndk'],
'extra_libs': [], 'extra_libs': [],
'extra_cflags': [],
'host_machine': { 'host_machine': {
'system': 'Android', 'system': 'Android',
'cpu_family': 'x86', 'cpu_family': 'x86',
@ -50,6 +52,7 @@ CROSS_ENV = {
'toolchain_names': ['mingw32_toolchain'], 'toolchain_names': ['mingw32_toolchain'],
'root_path': '/usr/i686-w64-mingw32/', 'root_path': '/usr/i686-w64-mingw32/',
'extra_libs': ['-lwinmm', '-lws2_32', '-lshlwapi', '-lrpcrt4', '-lmsvcr90'], 'extra_libs': ['-lwinmm', '-lws2_32', '-lshlwapi', '-lrpcrt4', '-lmsvcr90'],
'extra_cflags': ['-DWIN32'],
'host_machine': { 'host_machine': {
'system': 'windows', 'system': 'windows',
'cpu_family': 'x86', 'cpu_family': 'x86',
@ -60,6 +63,7 @@ CROSS_ENV = {
'debian_android': { 'debian_android': {
'toolchain_names': ['android_ndk'], 'toolchain_names': ['android_ndk'],
'extra_libs': [], 'extra_libs': [],
'extra_cflags': [],
'host_machine': { 'host_machine': {
'system': 'Android', 'system': 'Android',
'cpu_family': 'x86', 'cpu_family': 'x86',
@ -121,13 +125,13 @@ PACKAGE_NAME_MAPPERS = {
'ctpp2': ['libctpp2-dev'], 'ctpp2': ['libctpp2-dev'],
}, },
'debian_win32_dyn': { 'debian_win32_dyn': {
'COMMON': ['g++-mingw-w64-i686', 'gcc-mingw-w64-i686', 'gcc-mingw-w64-base', 'mingw-w64-tools', 'ccache'] 'COMMON': ['g++-mingw-w64-i686', 'gcc-mingw-w64-i686', 'gcc-mingw-w64-base', 'mingw-w64-tools', 'cmake', 'ccache']
}, },
'debian_win32_static': { 'debian_win32_static': {
'COMMON': ['g++-mingw-w64-i686', 'gcc-mingw-w64-i686', 'gcc-mingw-w64-base', 'mingw-w64-tools', 'ccache'] 'COMMON': ['g++-mingw-w64-i686', 'gcc-mingw-w64-i686', 'gcc-mingw-w64-base', 'mingw-w64-tools', 'cmake', 'ccache']
}, },
'debian_android': { 'debian_android': {
'COMMON': ['automake', 'gcc', 'cmake', 'ccache'] 'COMMON': ['automake', 'gcc', 'cmake', 'ccache', 'default-jdk']
}, },
} }

2
templates/meson_cross_file.txt
View File

@ -8,6 +8,8 @@ strip = '{toolchain.binaries[STRIP]}'
[properties] [properties]
c_link_args = {extra_libs!r} c_link_args = {extra_libs!r}
cpp_link_args = {extra_libs!r} cpp_link_args = {extra_libs!r}
c_args = {extra_cflags!r}
cpp_args = {extra_cflags!r}
[host_machine] [host_machine]
cpu_family = '{host_machine[cpu_family]}' cpu_family = '{host_machine[cpu_family]}'