From b090353001b5b5dd0e9d681da433339e3d4e5b01 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 14 Jun 2018 17:09:36 +0200 Subject: [PATCH] Do not use the system ctpp2 in native_dyn debian. The CI is using ubuntu artful and the deb package is compiled with another compiler that gcc-4.8 (used in other project CI). As we compile everything with gcc-4.8, we must compile our own ctpp2. --- Dockerfile | 4 ++-- kiwixbuild/packages.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9ec730..3237c40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,8 +37,8 @@ RUN \ libmagic-dev \ zlib1g-dev \ uuid-dev \ - ctpp2-utils \ - libctpp2-dev \ +# ctpp2-utils \ +# libctpp2-dev \ libmicrohttpd-dev \ # Qt packages libqt5gui5 \ diff --git a/kiwixbuild/packages.py b/kiwixbuild/packages.py index d12ec57..2193953 100644 --- a/kiwixbuild/packages.py +++ b/kiwixbuild/packages.py @@ -55,8 +55,8 @@ PACKAGE_NAME_MAPPERS = { 'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'], 'zlib': ['zlib1g-dev'], 'uuid': ['uuid-dev'], - 'ctpp2': ['libctpp2-dev'], - 'ctpp2c': ['ctpp2-utils'], + #'ctpp2': ['libctpp2-dev'], + #'ctpp2c': ['ctpp2-utils'], 'libmicrohttpd': ['libmicrohttpd-dev', 'ccache'], 'qt' : ['libqt5gui5', 'qtbase5-dev', 'qt5-default'], 'qtwebengine' : ['qtwebengine5-dev']