Do not try to compiled dependencies already in the org.kde.Platform.
This commit is contained in:
parent
8d58d8d7cb
commit
d375cc06bc
|
@ -230,28 +230,16 @@ class FlatpakBuilder:
|
||||||
|
|
||||||
|
|
||||||
def _get_packages(self):
|
def _get_packages(self):
|
||||||
packages_list = []
|
package_name_mapper = PACKAGE_NAME_MAPPERS.get('flatpak', {})
|
||||||
for platform in PlatformInfo.all_running_platforms.values():
|
|
||||||
mapper_name = "{host}_{target}".format(
|
|
||||||
host=neutralEnv('distname'),
|
|
||||||
target=platform)
|
|
||||||
package_name_mapper = PACKAGE_NAME_MAPPERS.get(mapper_name, {})
|
|
||||||
packages_list += package_name_mapper.get('COMMON', [])
|
|
||||||
|
|
||||||
to_drop = []
|
to_drop = []
|
||||||
for builderDef in self._targets:
|
for builderDef in self._targets:
|
||||||
platformName, builderName = builderDef
|
platformName, builderName = builderDef
|
||||||
mapper_name = "{host}_{target}".format(
|
|
||||||
host=neutralEnv('distname'),
|
|
||||||
target=platformName)
|
|
||||||
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)
|
||||||
for dep in to_drop:
|
for dep in to_drop:
|
||||||
del self._targets[dep]
|
del self._targets[dep]
|
||||||
return packages_list
|
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -3,6 +3,18 @@
|
||||||
_fedora_common = ['automake', 'libtool', 'cmake', 'git', 'subversion', 'ccache', 'pkgconfig', 'gcc-c++', 'gettext-devel']
|
_fedora_common = ['automake', 'libtool', 'cmake', 'git', 'subversion', 'ccache', 'pkgconfig', 'gcc-c++', 'gettext-devel']
|
||||||
_debian_common = ['automake', 'libtool', 'cmake', 'git', 'subversion', 'ccache', 'pkg-config', 'gcc', 'autopoint']
|
_debian_common = ['automake', 'libtool', 'cmake', 'git', 'subversion', 'ccache', 'pkg-config', 'gcc', 'autopoint']
|
||||||
PACKAGE_NAME_MAPPERS = {
|
PACKAGE_NAME_MAPPERS = {
|
||||||
|
'flatpak': {
|
||||||
|
'zlib': True,
|
||||||
|
'lzma': True,
|
||||||
|
'icu4c': True,
|
||||||
|
'qt': True,
|
||||||
|
'qtwebengine': True,
|
||||||
|
'ctpp2': True,
|
||||||
|
'ctpp2c': True,
|
||||||
|
'uuid': True,
|
||||||
|
'libxml2': True,
|
||||||
|
'libssl': True,
|
||||||
|
},
|
||||||
'fedora_native_dyn': {
|
'fedora_native_dyn': {
|
||||||
'COMMON': _fedora_common,
|
'COMMON': _fedora_common,
|
||||||
'uuid': ['libuuid-devel'],
|
'uuid': ['libuuid-devel'],
|
||||||
|
|
Loading…
Reference in New Issue