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

Fix `-fPIC` CXXFLAGS.

This commit is contained in:
Matthieu Gautier 2019-02-04 11:05:16 +01:00
parent c9210bb0e0
commit 466dc8b64a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/dependencies/base.py
View File

@ -312,6 +312,7 @@ class MakeBuilder(Builder):
env = Defaultdict(str, os.environ) env = Defaultdict(str, os.environ)
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'
if self.configure_env: if self.configure_env:
for k in self.configure_env: for k in self.configure_env:
if k.startswith('_format_'): if k.startswith('_format_'):
@ -367,6 +368,7 @@ class CMakeBuilder(MakeBuilder):
env = Defaultdict(str, os.environ) env = Defaultdict(str, os.environ)
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'
if self.configure_env: if self.configure_env:
for k in self.configure_env: for k in self.configure_env:
if k.startswith('_format_'): if k.startswith('_format_'):

4
kiwixbuild/dependencies/xapian.py
View File

@ -18,8 +18,8 @@ class Xapian(Dependency):
class Builder(MakeBuilder): class Builder(MakeBuilder):
configure_option = "--disable-sse --disable-backend-chert --disable-backend-inmemory --disable-documentation" configure_option = "--disable-sse --disable-backend-chert --disable-backend-inmemory --disable-documentation"
configure_env = {'_format_LDFLAGS': "-L{buildEnv.install_dir}/{buildEnv.libprefix}", configure_env = {'_format_LDFLAGS': "{env.LDFLAGS} -L{buildEnv.install_dir}/{buildEnv.libprefix}",
'_format_CXXFLAGS': "-I{buildEnv.install_dir}/include"} '_format_CXXFLAGS': "{env.CXXFLAGS} -I{buildEnv.install_dir}/include"}
@classmethod @classmethod
def get_dependencies(cls, platformInfo, allDeps): def get_dependencies(cls, platformInfo, allDeps):