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

Build zstd in flatpak. 

Revert 10c767e8ce
This commit is contained in:
Matthieu Gautier 2020-04-20 15:14:03 +02:00
parent 161c018702
commit 99226e0c6a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/dependencies/base.py
View File

@ -286,6 +286,8 @@ class Builder:
def set_flatpak_buildsystem(self, module): def set_flatpak_buildsystem(self, module):
if getattr(self, 'flatpak_buildsystem', None): if getattr(self, 'flatpak_buildsystem', None):
module['buildsystem'] = self.flatpak_buildsystem module['buildsystem'] = self.flatpak_buildsystem
if getattr(self, 'subsource_dir', None):
module['subdir'] = self.subsource_dir
if getattr(self, 'configure_option', ''): if getattr(self, 'configure_option', ''):
module['config-opts'] = self.configure_option.split(' ') module['config-opts'] = self.configure_option.split(' ')

2
kiwixbuild/flatpak_builder.py
View File

@ -139,8 +139,6 @@ class FlatpakBuilder:
steps = remove_duplicates(target_steps()) steps = remove_duplicates(target_steps())
modules = OrderedDict() modules = OrderedDict()
for stepDef in steps: for stepDef in steps:
if stepDef[1] == 'zstd':
continue
module = modules.setdefault(stepDef[1], {}) module = modules.setdefault(stepDef[1], {})
module['name'] = stepDef[1] module['name'] = stepDef[1]
if stepDef[0] == 'source': if stepDef[0] == 'source':