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 #414 from kiwix/fix_cross_file 

Always write the cross_file using the same name.
This commit is contained in:
Matthieu Gautier 2020-02-25 17:17:19 +01:00 committed by GitHub
parent d30ec7219e 6093c011ab
commit ad24eaab4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/platforms/android.py
View File

@ -87,7 +87,7 @@ class AndroidPlatformInfo(PlatformInfo):
def finalize_setup(self):
super().finalize_setup()
self.buildEnv.cmake_crossfile = self._gen_crossfile('cmake_android_cross_file.txt')
self.buildEnv.cmake_crossfile = self._gen_crossfile('cmake_android_cross_file.txt', 'cmake_cross_file.txt')
self.buildEnv.meson_crossfile = self._gen_crossfile('meson_cross_file.txt')

6
kiwixbuild/platforms/base.py
View File

@ -94,8 +94,10 @@ class PlatformInfo(metaclass=_MetaPlatform):
env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC'
def _gen_crossfile(self, name):
crossfile = pj(self.buildEnv.build_dir, name)
def _gen_crossfile(self, name, outname=None):
if outname is None:
outname = name
crossfile = pj(self.buildEnv.build_dir, outname)
template_file = pj(TEMPLATES_DIR, name)
with open(template_file, 'r') as f:
template = f.read()

2
kiwixbuild/platforms/i586.py
View File

@ -53,7 +53,7 @@ class I586PlatformInfo(PlatformInfo):
def finalize_setup(self):
super().finalize_setup()
self.buildEnv.cmake_crossfile = self._gen_crossfile('cmake_i586_cross_file.txt')
self.buildEnv.cmake_crossfile = self._gen_crossfile('cmake_i586_cross_file.txt', 'cmake_cross_file.txt')
self.buildEnv.meson_crossfile = self._gen_crossfile('meson_cross_file.txt')
class I586Dyn(I586PlatformInfo):

4
kiwixbuild/platforms/ios.py
View File

@ -27,8 +27,8 @@ class iOSPlatformInfo(PlatformInfo):
def finalize_setup(self):
super().finalize_setup()
self.buildEnv.cmake_crossfile = self._gen_crossfile('cmake_ios_cross_file.txt')
self.buildEnv.meson_crossfile = self._gen_crossfile('meson_ios_cross_file.txt')
self.buildEnv.cmake_crossfile = self._gen_crossfile('cmake_ios_cross_file.txt', 'cmake_cross_file.txt')
self.buildEnv.meson_crossfile = self._gen_crossfile('meson_ios_cross_file.txt', 'meson_cross_file.txt')
def get_cross_config(self):
return {