Merge pull request #435 from kiwix/flatpak_zstd

This commit is contained in:
Matthieu Gautier 2020-04-20 15:37:38 +02:00 committed by GitHub
commit c5c4a316b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

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

View File

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