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 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.
This commit is contained in:
Matthieu Gautier 2018-06-14 17:09:36 +02:00
parent 9ad07fe550
commit b090353001
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -37,8 +37,8 @@ RUN \
libmagic-dev \ libmagic-dev \
zlib1g-dev \ zlib1g-dev \
uuid-dev \ uuid-dev \
ctpp2-utils \ # ctpp2-utils \
libctpp2-dev \ # libctpp2-dev \
libmicrohttpd-dev \ libmicrohttpd-dev \
# Qt packages # Qt packages
libqt5gui5 \ libqt5gui5 \

4
kiwixbuild/packages.py
View File

@ -55,8 +55,8 @@ PACKAGE_NAME_MAPPERS = {
'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'], 'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'],
'zlib': ['zlib1g-dev'], 'zlib': ['zlib1g-dev'],
'uuid': ['uuid-dev'], 'uuid': ['uuid-dev'],
'ctpp2': ['libctpp2-dev'], #'ctpp2': ['libctpp2-dev'],
'ctpp2c': ['ctpp2-utils'], #'ctpp2c': ['ctpp2-utils'],
'libmicrohttpd': ['libmicrohttpd-dev', 'ccache'], 'libmicrohttpd': ['libmicrohttpd-dev', 'ccache'],
'qt' : ['libqt5gui5', 'qtbase5-dev', 'qt5-default'], 'qt' : ['libqt5gui5', 'qtbase5-dev', 'qt5-default'],
'qtwebengine' : ['qtwebengine5-dev'] 'qtwebengine' : ['qtwebengine5-dev']