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

Use relative path to configure. 

So we don't need to set srcdir in xapian
This commit is contained in:
Matthieu Gautier 2024-05-02 11:40:09 +02:00
parent c2e5fe06d0
commit d30dc90335
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwixbuild/dependencies/base.py
View File

@ -421,9 +421,11 @@ class MakeBuilder(Builder):
def _configure(self, context): def _configure(self, context):
context.try_skip(self.build_path) context.try_skip(self.build_path)
configure_path = self.source_path / self.configure_script
configure_path = configure_path.relative_to(self.build_path, walk_up=True)
command = [ command = [
*self.buildEnv.configure_wrapper, *self.buildEnv.configure_wrapper,
self.source_path / self.configure_script, configure_path,
*self.all_configure_options, *self.all_configure_options,
] ]
env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True) env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True)

2
kiwixbuild/dependencies/xapian.py
View File

@ -23,8 +23,6 @@ class Xapian(Dependency):
f"CXX={compile_script} cl -nologo", f"CXX={compile_script} cl -nologo",
"CXXFLAGS=-EHsc", "CXXFLAGS=-EHsc",
"AR=lib", "AR=lib",
"--srcdir",
"../../SOURCE/xapian-core-1.4.23",
] ]
else: else:
return [ return [