]>
Commit | Line | Data |
---|---|---|
ee68e9fa JB |
1 | From da26dfbf78468f5ed724e022b300a07862a95833 Mon Sep 17 00:00:00 2001 |
2 | From: Diego Escalante Urrelo <diegoe@gnome.org> | |
3 | Date: Sun, 27 Oct 2019 03:45:20 -0500 | |
4 | Subject: [PATCH] build: Update gtk-doc generation to meson changes | |
5 | ||
6 | After updating our use of link_with/link_whole for meson-0.52.0 we | |
7 | accidentally broke gtk-doc generation. | |
8 | ||
9 | Before c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f gnome_builder_deps | |
10 | included link_whole calls to all our libide static libraries. Because we | |
11 | changed those calls to link_with, libide_gtk_doc was no longer linking | |
12 | properly. | |
13 | ||
14 | To solve the above we now use gnome_builder_static, which is a list of | |
15 | all our internal libide static libraries and can be used as an argument | |
16 | to link_whole, just like we do in the gnome_builder target. | |
17 | ||
18 | Fixes: https://gitlab.gnome.org/GNOME/gnome-builder/issues/1063 | |
19 | --- | |
20 | doc/sdk/meson.build | 2 +- | |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
22 | ||
23 | diff --git a/doc/sdk/meson.build b/doc/sdk/meson.build | |
24 | index 4bb2421b3..f6ff1a3b7 100644 | |
25 | --- a/doc/sdk/meson.build | |
26 | +++ b/doc/sdk/meson.build | |
27 | @@ -30,7 +30,7 @@ docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html') | |
28 | ||
29 | libide_gtk_doc = shared_library('ide-gtk-doc', | |
30 | c_args: libide_args + release_args, | |
31 | - dependencies: gnome_builder_deps, | |
32 | + link_whole: gnome_builder_static, | |
33 | ) | |
34 | ||
35 | libide_gtk_doc_dep = declare_dependency( |