From d30dc90335b2697c709bfd65388feeb6caa71de7 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 2 May 2024 11:40:09 +0200 Subject: [PATCH] Use relative path to configure. So we don't need to set srcdir in xapian --- kiwixbuild/dependencies/base.py | 4 +++- kiwixbuild/dependencies/xapian.py | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 1ba0222..2f70af8 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -421,9 +421,11 @@ class MakeBuilder(Builder): def _configure(self, context): 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 = [ *self.buildEnv.configure_wrapper, - self.source_path / self.configure_script, + configure_path, *self.all_configure_options, ] env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True) diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py index 760e8c3..ae3641d 100644 --- a/kiwixbuild/dependencies/xapian.py +++ b/kiwixbuild/dependencies/xapian.py @@ -23,8 +23,6 @@ class Xapian(Dependency): f"CXX={compile_script} cl -nologo", "CXXFLAGS=-EHsc", "AR=lib", - "--srcdir", - "../../SOURCE/xapian-core-1.4.23", ] else: return [