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

Do not build static AND shared libs when compiling ICU. 

ICU seems to be buggy when generating pkg_config file if we compile static
and shared libs with mingw target.

As icu mingw target definition seems a bit complex it is simpler to just
compile the libs we want.
As side effect, it reduces compilation time a bit.
This commit is contained in:
Matthieu Gautier 2017-01-17 15:37:42 +01:00 committed by Matthieu Gautier
parent f287cf8b19
commit 5d710fc774
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kiwix-build.py
View File

@ -579,7 +579,6 @@ class Icu(Dependency, ReleaseDownloadMixin, MakeMixin):
data = Remotefile('icudt56l.dat', data = Remotefile('icudt56l.dat',
'e23d85eee008f335fc49e8ef37b1bc2b222db105476111e3d16f0007d371cbca') 'e23d85eee008f335fc49e8ef37b1bc2b222db105476111e3d16f0007d371cbca')
patches = ["icu4c_fix_static_lib_name_mingw.patch"] patches = ["icu4c_fix_static_lib_name_mingw.patch"]
configure_option = "--disable-samples --disable-tests --disable-extras --enable-static --disable-dyload"
subsource_dir = "source" subsource_dir = "source"
def __init__(self, buildEnv, cross_compile_process=False, cross_build=None): def __init__(self, buildEnv, cross_compile_process=False, cross_build=None):
@ -595,7 +594,11 @@ class Icu(Dependency, ReleaseDownloadMixin, MakeMixin):
@property @property
def configure_option(self): def configure_option(self):
default_configure_option = "--disable-samples --disable-tests --disable-extras --enable-static --disable-dyload" default_configure_option = "--disable-samples --disable-tests --disable-extras --disable-dyload"
if self.buildEnv.build_static:
default_configure_option += " --enable-static --disable-shared"
else:
default_configure_option += " --enable-shared --enable-shared"
if self.cross_build: if self.cross_build:
return default_configure_option + " --with-cross-build=" + self.cross_build.build_path return default_configure_option + " --with-cross-build=" + self.cross_build.build_path
return default_configure_option return default_configure_option