From 620f1b5e13bf7f9937342bb6d6febbff0f3b3af1 Mon Sep 17 00:00:00 2001 From: Kelson Date: Sat, 7 Jul 2018 20:19:34 +0200 Subject: [PATCH 1/2] Use -llog only for Android --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 69fda8842..50ae99ffe 100644 --- a/meson.build +++ b/meson.build @@ -7,6 +7,11 @@ compiler = meson.get_compiler('cpp') find_library_in_compiler = meson.version().version_compare('>=0.31.0') static_deps = get_option('android') or get_option('default_library') == 'static' +if get_option('android') + extra_libs = ['-llog'] +else + extra_libs = [] +endif thread_dep = dependency('threads') libicu_dep = dependency('icu-i18n', static:static_deps) @@ -95,7 +100,6 @@ if xapian_dep.found() pkg_requires += ['xapian-core'] endif -extra_libs = ['-llog'] extra_cflags = '' if has_ctpp2_dep extra_libs += ctpp2_link_args From c0d5e091d36cf492699b6377f9170ffb4bc09d23 Mon Sep 17 00:00:00 2001 From: Kelson Date: Sat, 7 Jul 2018 21:15:48 +0200 Subject: [PATCH 2/2] Small update of the README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4190be903..0cdec90e8 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ to [kiwix-build](https://github.com/kiwix/kiwix-build). Preamble -------- -Although the Kiwix library can be compiled/cross-compiled on/for many +Although the Kiwix library can be (cross-)compiled on/for many sytems, the following documentation explains how to do it on POSIX -ones. It is primarly though for GNU/Linux systems and has been tested +ones. It is primarly thought for GNU/Linux systems and has been tested on recent releases of Ubuntu and Fedora. Dependencies