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

Merge pull request #308 from kiwix/qt_build 

Qt build
This commit is contained in:
Matthieu Gautier 2019-04-02 13:44:27 +02:00 committed by GitHub
parent 9cd8fae632 3022361d7e
commit e7a8583d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwixbuild/builder.py
View File

@ -136,8 +136,10 @@ class Builder:
package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {}) package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {})
packages = package_name_mapper.get(builderName) packages = package_name_mapper.get(builderName)
if packages: if packages:
packages_list += packages
to_drop.append(builderDef) to_drop.append(builderDef)
if packages is not True:
# True means "assume the dependency is install but do not try to install anything for it"
packages_list += packages
for dep in to_drop: for dep in to_drop:
del self._targets[dep] del self._targets[dep]
return packages_list return packages_list

2
kiwixbuild/packages.py
View File

@ -27,6 +27,8 @@ PACKAGE_NAME_MAPPERS = {
'file' : ['file-devel'], 'file' : ['file-devel'],
'gumbo' : ['gumbo-parser-devel'], 'gumbo' : ['gumbo-parser-devel'],
'aria2': ['aria2'], 'aria2': ['aria2'],
'qt': ['qt5-qtbase-devel', 'qt5-devel', 'qt5-qtsvg'],
'qtwebengine': ['qt5-qtwebengine-devel']
}, },
'fedora_native_static': { 'fedora_native_static': {
'COMMON': _fedora_common + ['glibc-static', 'libstdc++-static'], 'COMMON': _fedora_common + ['glibc-static', 'libstdc++-static'],