dconf: fix build with meson 0.52+
This commit is contained in:
parent
a94fd343f3
commit
ae048b1396
1 changed files with 32 additions and 0 deletions
32
srcpkgs/dconf/patches/fix-build-meson-052.patch
Normal file
32
srcpkgs/dconf/patches/fix-build-meson-052.patch
Normal file
|
@ -0,0 +1,32 @@
|
|||
From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Thu, 31 Oct 2019 05:51:22 -0500
|
||||
Subject: [PATCH] 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
|
||||
---
|
||||
client/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/client/meson.build b/client/meson.build
|
||||
index f3b7122..de6387e 100644
|
||||
--- client/meson.build
|
||||
+++ 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(
|
Loading…
Reference in a new issue