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

Fix setting of environment using env from dependency. 

If `self.configure_env` is a (computed) property, the previous code
never format the value of the env.
This commit is contained in:
Matthieu Gautier 2020-02-19 16:33:18 +01:00
parent 2c14c1a705
commit 7d742f807f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kiwixbuild/dependencies/base.py
View File

@ -323,13 +323,14 @@ class MakeBuilder(Builder):
if self.buildEnv.platformInfo.static: if self.buildEnv.platformInfo.static:
env['CFLAGS'] = env['CFLAGS'] + ' -fPIC' env['CFLAGS'] = env['CFLAGS'] + ' -fPIC'
env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC' env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC'
if self.configure_env: dep_conf_env = self.configure_env
for k in list(self.configure_env): if dep_conf_env:
for k in list(dep_conf_env):
if k.startswith('_format_'): if k.startswith('_format_'):
v = self.configure_env.pop(k) v = dep_conf_env.pop(k)
v = v.format(buildEnv=self.buildEnv, env=env) v = v.format(buildEnv=self.buildEnv, env=env)
self.configure_env[k[8:]] = v dep_conf_env[k[8:]] = v
env.update(self.configure_env) env.update(dep_conf_env)
run_command(command, self.build_path, context, buildEnv=self.buildEnv, env=env) run_command(command, self.build_path, context, buildEnv=self.buildEnv, env=env)
def _compile(self, context): def _compile(self, context):