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

Use 'debian' configuration if we are on 'Ubuntu'. 

This is the same configuration. Do not duplicate it.
This commit is contained in:
Matthieu Gautier 2017-02-07 12:18:54 +01:00
parent c705463d51
commit 796dc8f563
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kiwix-build.py
View File

@ -45,7 +45,7 @@ CROSS_ENV = {
'_format_PKG_CONFIG_LIBDIR' : '{root_path}/lib/pkgconfig'
}
},
'Ubuntu_win32' : {
'debian_win32' : {
'root_path' : '/usr/i686-w64-mingw32/',
'binaries' : {
'c' : 'i686-w64-mingw32-gcc',
@ -101,19 +101,6 @@ PACKAGE_NAME_MAPPERS = {
'libmicrohttpd' : None, # ['mingw32-libmicrohttpd-static'] packaging dependecy seems buggy, and some static lib are name libfoo.dll.a and
# gcc cannot found them.
},
'Ubuntu_native_dyn' : {
'COMMON' : ['gcc', 'cmake', 'libbz2-dev'],
'zlib' : ['zlib1g-dev'],
'uuid' : ['uuid-dev'],
'ctpp2': ['libctpp2-dev'],
'libmicrohttpd' : ['libmicrohttpd-dev']
},
'Ubuntu_native_static' : {
'COMMON' : ['gcc', 'cmake', 'libbz2-dev'],
'zlib' : ['zlib1g-dev'],
'uuid' : ['uuid-dev'],
'ctpp2': ['libctpp2-dev'],
},
'debian_native_dyn' : {
'COMMON' : ['gcc', 'cmake', 'libbz2-dev'],
'uuid' : ['uuid-dev'],
@ -253,6 +240,8 @@ class BuildEnv:
if _platform != 'Linux':
sys.exit('ERROR: kiwix-build is intented to run only on Linux platform')
self.distname, self.distversion, _ = platform.dist()
if self.distname == 'Ubuntu':
self.distname = 'debian'
def setup_build_target(self, build_target):
self.build_target = build_target