mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-08 17:39:24 +00:00
dconf: Fix build with meson 0.52
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Slightly adjusted patch sent to mailing list [1] [1] http://lists.openembedded.org/pipermail/openembedded-core/2019-October/288108.html Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,25 @@
|
|||||||
|
With meson 0.52 the build fails due to duplicate symbols. There is a fix
|
||||||
|
to meson but the dconf build also needs tweaking.
|
||||||
|
|
||||||
|
https://gitlab.gnome.org/GNOME/dconf/issues/59
|
||||||
|
https://github.com/mesonbuild/meson/pull/5936
|
||||||
|
|
||||||
|
Despite the comments there about this being incorrect, libdconf is unchanged
|
||||||
|
between 0.51 and 0.52 and this patch.
|
||||||
|
|
||||||
|
Upstream-Status: Pending [under discussion, see above links]
|
||||||
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
|
||||||
|
Index: dconf-0.34.0/client/meson.build
|
||||||
|
===================================================================
|
||||||
|
--- dconf-0.34.0.orig/client/meson.build
|
||||||
|
+++ dconf-0.34.0/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(
|
||||||
@@ -12,6 +12,8 @@ GNOMEBASEBUILDCLASS = "meson"
|
|||||||
|
|
||||||
inherit gnomebase bash-completion vala
|
inherit gnomebase bash-completion vala
|
||||||
|
|
||||||
|
SRC_URI += "file://fix-meson-0.52.patch"
|
||||||
|
|
||||||
# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
|
# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
|
||||||
EXTRA_OEMESON = "-Dman=false"
|
EXTRA_OEMESON = "-Dman=false"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user