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

Use the 'mingw32-cmake' wrapper to launch cmake instead of cmake iteslf. 

The wrapper provided by Fedora properly configure cmake for
cross-compiling.

We have to check how this work with other distribution or other
cross-compilation target but for now, it's working.
This commit is contained in:
Matthieu Gautier 2017-01-30 16:52:59 +01:00
parent 9cfa11a883
commit 514a53db2a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kiwix-build.py
View File

@ -120,6 +120,7 @@ class BuildEnv:
def setup_native(self): def setup_native(self):
self.wrapper = None self.wrapper = None
self.cmake_command = "cmake"
self.configure_option = "" self.configure_option = ""
self.cmake_option = "" self.cmake_option = ""
self.meson_crossfile = None self.meson_crossfile = None
@ -165,7 +166,8 @@ class BuildEnv:
current_permissions = stat.S_IMODE(os.lstat(self.wrapper).st_mode) current_permissions = stat.S_IMODE(os.lstat(self.wrapper).st_mode)
os.chmod(self.wrapper, current_permissions | stat.S_IXUSR) os.chmod(self.wrapper, current_permissions | stat.S_IXUSR)
self.configure_option = "--host=i686-w64-mingw32" self.configure_option = "--host=i686-w64-mingw32"
self.cmake_option = "-DCMAKE_SYSTEM_NAME=Windows" self.cmake_command = "mingw32-cmake"
self.cmake_option = ""
self._gen_meson_crossfile() self._gen_meson_crossfile()
@ -416,8 +418,9 @@ class MakeMixin:
class CMakeMixin(MakeMixin): class CMakeMixin(MakeMixin):
def _configure(self, context): def _configure(self, context):
context.try_skip(self.build_path) context.try_skip(self.build_path)
command = "cmake {configure_option} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_INSTALL_PREFIX={install_dir} -DCMAKE_INSTALL_LIBDIR={libdir} {source_path}" command = "{command} {configure_option} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_INSTALL_PREFIX={install_dir} -DCMAKE_INSTALL_LIBDIR={libdir} {source_path}"
command = command.format( command = command.format(
command = self.buildEnv.cmake_command,
configure_option = "{} {}".format(self.buildEnv.cmake_option, self.configure_option), configure_option = "{} {}".format(self.buildEnv.cmake_option, self.configure_option),
install_dir = self.buildEnv.install_dir, install_dir = self.buildEnv.install_dir,
libdir = self.buildEnv.libprefix, libdir = self.buildEnv.libprefix,
@ -433,7 +436,7 @@ class CMakeMixin(MakeMixin):
v = v.format(buildEnv=self.buildEnv, env=env) v = v.format(buildEnv=self.buildEnv, env=env)
self.configure_env[k[8:]] = v self.configure_env[k[8:]] = v
env.update(self.configure_env) env.update(self.configure_env)
self.buildEnv.run_command(command, self.build_path, context, env=env) self.buildEnv.run_command(command, self.build_path, context, env=env, allow_wrapper=False)
class MesonMixin(MakeMixin): class MesonMixin(MakeMixin):
def _gen_env(self): def _gen_env(self):