[balsa] Make '-lz' a dependency, not a global link arg
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Make '-lz' a dependency, not a global link arg
- Date: Wed, 20 Sep 2017 16:34:52 +0000 (UTC)
commit 049f0a29782b62436f425565e6d0f7aedfe5f7f0
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Wed Sep 20 12:33:41 2017 -0400
Make '-lz' a dependency, not a global link arg
Pass '-lz' link argument as a dependency of libimap instead of through
add_global_link_arguments
* libbalsa/imap/meson.build: add the dependency.
* meson.build: do not use add_global_link_arguments.
ChangeLog | 8 ++++++++
libbalsa/imap/meson.build | 3 ++-
meson.build | 3 ---
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ddca3a6..c30e365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2017-09-20 Peter Bloomfield <pbloomfield bellsouth net>
+ Pass '-lz' link argument as a dependency of libimap instead of through
+ add_global_link_arguments
+
+ * libbalsa/imap/meson.build: add the dependency.
+ * meson.build: do not use add_global_link_arguments.
+
+2017-09-20 Peter Bloomfield <pbloomfield bellsouth net>
+
Use 'glib-genmarshal --header --body' to generate marshal.c
files, instead of catting a header line to the file
diff --git a/libbalsa/imap/meson.build b/libbalsa/imap/meson.build
index eb6345c..9dfcece 100644
--- a/libbalsa/imap/meson.build
+++ b/libbalsa/imap/meson.build
@@ -29,7 +29,8 @@ libimap_compile_args = ['-I' + meson.build_root(),
'-I' + join_paths(meson.source_root(), 'libnetclient'),
'-I' + join_paths(meson.source_root(), 'libbalsa', 'imap'),
'-ansi']
-libimap_compile_dep = declare_dependency(compile_args : libimap_compile_args)
+libimap_compile_dep = declare_dependency(compile_args : libimap_compile_args,
+ link_args : '-lz')
# genmarshal
#
diff --git a/meson.build b/meson.build
index e539910..fb70a68 100644
--- a/meson.build
+++ b/meson.build
@@ -143,9 +143,6 @@ conf.set('TOOLKIT_CATEGORIES', TOOLKIT_CATEGORIES)
# Libraries.
# #####################################################################
-# Make sure ld finds zlib:
-add_global_link_arguments('-lz', language : 'c')
-
# Dependencies for balsa and balsa_ab:
glib_dep = dependency('glib-2.0', version : '>= 2.40.0')
gtk_dep = dependency('gtk+-3.0', version : '>= 3.10.0')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]