gjdwebserver-overlay/mail-client/geary/files/0097-build-Make-comment-about-system-libs-with-custom-VAP.patch

36 lines
1.4 KiB
Diff
Raw Normal View History

2021-03-23 14:05:24 +01:00
From 7c0ad051bd7b59cab1f26e13004d54a6bdbf2c2e Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 13 Sep 2020 16:26:46 +1000
Subject: [PATCH 097/124] build: Make comment about system libs with custom
VAPI more generic
---
meson.build | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index f8e7b741..84cb43f9 100644
--- a/meson.build
+++ b/meson.build
@@ -105,11 +105,13 @@ libytnef = dependency('libytnef', version: '>= 1.9.3', required: get_option('tne
posix = valac.find_library('posix')
webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
-# Libunwind system dependencies above ensures appropriate versions,
-# but this declared dependency is what we actually build against so we
-# 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.
+# System dependencies above ensures appropriate versions for the
+# following libraries, but the declared dependency is what we actually
+# build against so we can include the custom VAPI correctly.
+
if libunwind_dep.found()
+ # We need to add native lib to the search path for these so Flatpak
+ # builds can find it.
unwind_lib = libunwind_dep.get_pkgconfig_variable('libdir')
libunwind = declare_dependency(
dependencies: [
--
2.29.2