From 6d4f01abb3f6c2de4511c8e0b0d285edebf98e2f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 28 Dec 2021 02:33:31 +0200 Subject: [PATCH 36/37] Meson: Use cross_lib_path in search of more libraries Several library lookups did not respect to cross_lib_path. See osdn #43456 Signed-off-by: Marko Lindqvist --- meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index a8f48ae2b2..3ab68c2acb 100644 --- a/meson.build +++ b/meson.build @@ -237,19 +237,22 @@ else bcrypt_lib_dep = [] endif -readline_dep = c_compiler.find_library('readline', required:false) +readline_dep = c_compiler.find_library('readline', dirs: cross_lib_path, + required:false) if readline_dep.found() pub_conf_data.set('FREECIV_HAVE_LIBREADLINE', 1) endif -lzma_dep = c_compiler.find_library('lzma', required:false) +lzma_dep = c_compiler.find_library('lzma', dirs: cross_lib_path, + required:false) if lzma_dep.found() pub_conf_data.set('FREECIV_HAVE_LIBLZMA', 1) endif -zstd_dep = c_compiler.find_library('zstd', required:false) +zstd_dep = c_compiler.find_library('zstd', dirs: cross_lib_path, + required:false) if zstd_dep.found() pub_conf_data.set('FREECIV_HAVE_LIBZSTD', 1) -- 2.34.1