| Brad Bishop | 2d39a06 | 2019-10-28 08:33:36 -0400 | [diff] [blame] | 1 | With meson 0.52 the build fails due to duplicate symbols. There is a fix |
| 2 | to meson but the dconf build also needs tweaking. |
| 3 | |
| 4 | https://gitlab.gnome.org/GNOME/dconf/issues/59 |
| 5 | https://github.com/mesonbuild/meson/pull/5936 |
| 6 | |
| 7 | Despite the comments there about this being incorrect, libdconf is unchanged |
| 8 | between 0.51 and 0.52 and this patch. |
| 9 | |
| 10 | Upstream-Status: Pending [under discussion, see above links] |
| 11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 12 | |
| 13 | Index: dconf-0.34.0/client/meson.build |
| 14 | =================================================================== |
| 15 | --- dconf-0.34.0.orig/client/meson.build |
| 16 | +++ dconf-0.34.0/client/meson.build |
| 17 | @@ -28,7 +28,7 @@ libdconf_client = static_library( |
| 18 | |
| 19 | libdconf_client_dep = declare_dependency( |
| 20 | dependencies: gio_dep, |
| 21 | - link_whole: libdconf_client, |
| 22 | + link_with: libdconf_client, |
| 23 | ) |
| 24 | |
| 25 | libdconf = shared_library( |