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

Correctly pass arguments to kiwix-tools meson script. 

Now that meson.build script add itself the needed link flags to link
static binaries, we don't need to add them by ourself.

Just pass the right option to meson.
This commit is contained in:
Matthieu Gautier 2017-01-31 14:49:03 +01:00
parent f907eb16e9
commit 1d94429947
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiwix-build.py
View File

@ -569,6 +569,7 @@ class CMakeBuilder(MakeBuilder):
env.update(self.configure_env) env.update(self.configure_env)
self.buildEnv.run_command(command, self.build_path, context, env=env, allow_wrapper=False) self.buildEnv.run_command(command, self.build_path, context, env=env, allow_wrapper=False)
class MesonBuilder(Builder): class MesonBuilder(Builder):
configure_option = "" configure_option = ""
def _gen_env(self): def _gen_env(self):
@ -578,8 +579,6 @@ class MesonBuilder(Builder):
else pj(self.buildEnv.install_dir, self.buildEnv.libprefix, 'pkgconfig') else pj(self.buildEnv.install_dir, self.buildEnv.libprefix, 'pkgconfig')
) )
env['PATH'] = ':'.join([pj(self.buildEnv.install_dir, 'bin'), env['PATH']]) env['PATH'] = ':'.join([pj(self.buildEnv.install_dir, 'bin'), env['PATH']])
if self.buildEnv.build_static:
env['LDFLAGS'] = env['LDFLAGS'] + " -static-libstdc++ --static"
return env return env
def _configure(self, context): def _configure(self, context):
@ -808,7 +807,12 @@ class KiwixTools(Dependency):
git_dir = "kiwix-tools" git_dir = "kiwix-tools"
class Builder(MesonBuilder): class Builder(MesonBuilder):
configure_option = "-Dctpp2-install-prefix={buildEnv.install_dir}" @property
def configure_option(self):
base_options = "-Dctpp2-install-prefix={buildEnv.install_dir}"
if self.buildEnv.build_static:
base_options += " -Dstatic-linkage=true"
return base_options
class Builder: class Builder: