From 1c8b8ef99bd33aeb991001caeaa31dbf53c57fac Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 12 Dec 2017 11:19:07 +0000 Subject: [PATCH 1/2] Stop using the deprecated (and broken) `mesontest`. `mesontest` command is deprecated since meson 0.42.0 and broken with last release (0.44.0) (see mesonbuild/meson#2761). Fix #97. --- kiwix-build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kiwix-build.py b/kiwix-build.py index eee3e19..cf390c0 100755 --- a/kiwix-build.py +++ b/kiwix-build.py @@ -254,7 +254,7 @@ class BuildEnv: self.meson_command = self._detect_meson() if not self.meson_command: sys.exit("ERROR: meson command not fount") - self.mesontest_command = "mesontest" + self.mesontest_command = "meson test" self.setup_build(options.target_platform) self.setup_toolchains() self.options = options From 6768631b25591b97fd7fe42a70dfbd6f7bec0ccf Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 13 Dec 2017 15:09:58 +0100 Subject: [PATCH 2/2] Force installation of meson 0.43.0. There are some problem in meson 0.44.0. `meson` change the way it detects static libraries (to something that seems better to me), but it breaks some of our build that we have to fix. Until we have fixed our dependencies declaration, let's force meson to be in 0.43.0. --- travis/install_extra_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/install_extra_deps.sh b/travis/install_extra_deps.sh index fa5910c..987c2d0 100755 --- a/travis/install_extra_deps.sh +++ b/travis/install_extra_deps.sh @@ -6,7 +6,7 @@ orig_dir=$(pwd) sudo apt-get update -qq sudo apt-get install -qq python3-pip zlib1g-dev libjpeg-dev -pip3 install --user meson +pip3 install --user meson==0.43.0 pip3 install --user pillow # ninja