summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@gnome.org>2019-10-31 05:51:22 -0500
committerDiego Escalante Urrelo <diegoe@gnome.org>2019-11-06 17:57:49 -0500
commitcc32667c5d7d9ff95e65cc21f59905d8f9218394 (patch)
treee655d0ec2324fce9f93d051d139951464553e891
parent4723747667cef384c8da48da9546d430b5a69de3 (diff)
downloaddconf-cc32667c5d7d9ff95e65cc21f59905d8f9218394.tar.gz
build: Update use of link_whole for meson-0.52
A regression in meson-0.52 caused uses of link_whole to expose scenarios where duplicate symbols issues could appear. In particular libdconf_client_dep was being link_whole'd to itself, which recursively already included libdconf_common which was also a link_whole. This change does not modify the available symbols in libdconf.so, and is compatible with meson-0.52 and 0.51. See: https://github.com/mesonbuild/meson/pull/6030 Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
-rw-r--r--client/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/meson.build b/client/meson.build
index f3b7122..de6387e 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -28,7 +28,7 @@ libdconf_client = static_library(
libdconf_client_dep = declare_dependency(
dependencies: gio_dep,
- link_whole: libdconf_client,
+ link_with: libdconf_client,
)
libdconf = shared_library(