From a3662c8155356d2fc15b1acf1558fccec71aa9f9 Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Wed, 4 Jul 2018 13:15:20 +1000 Subject: [PATCH] Fix libunwind native dep so Flatpak builds once again. --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index af169ebe..07d36c14 100644 --- a/meson.build +++ b/meson.build @@ -74,12 +74,14 @@ webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: ' # Libunwind system dependencies above ensures appropriate versions, # but this declared depencency is what we actually build against so we -# can include the custom VAPI correctly. +# can include the custom VAPI correctly. We need to add unwind_lib to +# the search path for these so Flatpak builds can find the C lib. +unwind_lib = libunwind_dep.get_pkgconfig_variable('libdir') libunwind = declare_dependency( dependencies: [ - valac.find_library('libunwind', dirs: vapi_dir), - cc.find_library('unwind'), - cc.find_library('unwind-generic') + valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), + cc.find_library('libunwind', dirs: unwind_lib), + cc.find_library('libunwind-generic', dirs: unwind_lib) ], )