From 5d710fc774fabd55afb496a21273f4227aec7d69 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Jan 2017 15:37:42 +0100 Subject: [PATCH] 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. --- kiwix-build.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kiwix-build.py b/kiwix-build.py index 288e8fc..1d8dd89 100755 --- a/kiwix-build.py +++ b/kiwix-build.py @@ -579,7 +579,6 @@ class Icu(Dependency, ReleaseDownloadMixin, MakeMixin): data = Remotefile('icudt56l.dat', 'e23d85eee008f335fc49e8ef37b1bc2b222db105476111e3d16f0007d371cbca') patches = ["icu4c_fix_static_lib_name_mingw.patch"] - configure_option = "--disable-samples --disable-tests --disable-extras --enable-static --disable-dyload" subsource_dir = "source" def __init__(self, buildEnv, cross_compile_process=False, cross_build=None): @@ -595,7 +594,11 @@ class Icu(Dependency, ReleaseDownloadMixin, MakeMixin): @property 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: return default_configure_option + " --with-cross-build=" + self.cross_build.build_path return default_configure_option