From 66ccbd065dad50d288657e0e82932300308601fc Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Tue, 12 May 2020 22:31:09 +0200 Subject: [PATCH] Also statically link Boost for the 32-bit host Somehow the Ubuntu 20.04 build just did this without being told, but the Ubuntu 18.04 build did not. With the static link option Meson will by default only search under /usr/lib, so for our CI builds we need to explicitly tell it to also search under /usr/local/lib since that's where we manually installed Boost 1.72. --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index db7f34e0..4d534d67 100644 --- a/meson.build +++ b/meson.build @@ -99,8 +99,12 @@ if get_option('use-bitbridge') # I honestly have no idea what the correct way to have `find_dependency()` use # `/usr/lib32` instead of `/usr/lib` is. If anyone does know, please tell me! winegcc = meson.get_compiler('cpp', native : false) - boost_dep = [winegcc.find_library('boost_filesystem')] - xcb_dep = [winegcc.find_library('xcb')] + boost_dep = winegcc.find_library( + 'boost_filesystem', + static : true, + dirs : ['/usr/lib', '/usr/local/lib'] + ) + xcb_dep = winegcc.find_library('xcb') executable( host_name_32bit,