From 9f877180dfa5809c0c122a26c3e9b13146fca1e2 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 23 Apr 2018 11:25:28 +0200 Subject: [PATCH] Do not compile libaria2 with sqlite3 and libxml2. Those dependencies are used for bittorent and metalink. For now, we don't support those features (we should in the future). However, it seems that if development package are installed on the system, libaria will try to link with libsqlite3 and libxml3 anyway. We have to investigate this, but it breaks static build of kiwix-tools. As we are not using those feature for now, let's just explicitly compile libaria2 without sqlite3 and libxml2. --- kiwixbuild/__init__.py | 4 ++-- kiwixbuild/dependencies.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kiwixbuild/__init__.py b/kiwixbuild/__init__.py index 0a89710..e780385 100644 --- a/kiwixbuild/__init__.py +++ b/kiwixbuild/__init__.py @@ -96,10 +96,10 @@ PACKAGE_NAME_MAPPERS = { 'ctpp2c': ['ctpp2-utils'], }, 'debian_i586_dyn': { - 'COMMON': _debian_common + ['libc6-dev:i386', 'libstdc++-6-dev:i386', 'gcc-multilib', 'g++-multilib', 'libxml2-dev:i386', 'libsqlite3-dev:i386'], + 'COMMON': _debian_common + ['libc6-dev:i386', 'libstdc++-6-dev:i386', 'gcc-multilib', 'g++-multilib'], }, 'debian_i586_static': { - 'COMMON': _debian_common + ['libc6-dev:i386', 'libstdc++-6-dev:i386', 'gcc-multilib', 'g++-multilib', 'libxml2-dev:i386', 'libsqlite3-dev:i386'], + 'COMMON': _debian_common + ['libc6-dev:i386', 'libstdc++-6-dev:i386', 'gcc-multilib', 'g++-multilib'], }, 'debian_win32_dyn': { 'COMMON': _debian_common + ['g++-mingw-w64-i686', 'gcc-mingw-w64-i686', 'gcc-mingw-w64-base', 'mingw-w64-tools'], diff --git a/kiwixbuild/dependencies.py b/kiwixbuild/dependencies.py index 0f109ff..d23ca51 100644 --- a/kiwixbuild/dependencies.py +++ b/kiwixbuild/dependencies.py @@ -217,7 +217,7 @@ class Aria2(Dependency): self.buildEnv.run_command(command, self.extract_path, context) class Builder(MakeBuilder): - configure_option = "--enable-libaria2 --disable-ssl --disable-bittorent --disable-metalink" + configure_option = "--enable-libaria2 --disable-ssl --disable-bittorent --disable-metalink --without-sqlite3 --without-libxml2 --without-libexpat" class Gumbo(Dependency):