From 4aba306d685d7787fce86a2e6b0d62465a0b2dab Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 6 Feb 2017 19:03:22 +0100 Subject: [PATCH] Add missing linking flag for uuid and rt. Those libraries are used by xapian, so it should be declare there. But for now, add the link in our compile script as we still want to compile. --- meson.build | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ed8b61c..da172aa 100644 --- a/meson.build +++ b/meson.build @@ -55,7 +55,17 @@ else ctpp2_dep = declare_dependency(include_directories:ctpp2_include_path, link_args:link_args) endif -all_deps = [thread_dep, kiwixlib_dep, microhttpd_dep, ctpp2_dep, z_dep] +# This is a temporary workaround until xapian fix it's xapian-core.pc +# For a correct dependency checking we should test if uuid is really installed +# but for a workaround, we assume that in xapian is installed, uuid also. +if meson.is_cross_build() and host_machine.system() == 'windows' + # xapian doesn't use uuid on windows. + uuid_dep = declare_dependency() +else + uuid_dep = declare_dependency(link_args:['-luuid', '-lrt']) +endif + +all_deps = [thread_dep, kiwixlib_dep, microhttpd_dep, ctpp2_dep, z_dep, uuid_dep] #subdir('include') subdir('static')