1 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 574bb38557..69bcd0dd1d 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -30,11 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
 inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check
-GTKDOC_ENABLE_FLAG = "-Dgtk_doc=true"
+GTKDOC_MESON_OPTION = "gtk_doc"
-GTKDOC_DISABLE_FLAG = "-Dgtk_doc=false"
-EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
-                                                                                     '${GTKDOC_DISABLE_FLAG}', d)} "
 # This avoids the need to depend on target python3, which in case of mingw is not even possible.
 # meson's python configuration pokes into python3 configuration, so this provides the native config to it.

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 574bb38557..69bcd0dd1d 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -30,11 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
30		30
31	inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check	31	inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check
32		32
33	GTKDOC_ENABLE_FLAG = "-Dgtk_doc=true"	33	GTKDOC_MESON_OPTION = "gtk_doc"
34	GTKDOC_DISABLE_FLAG = "-Dgtk_doc=false"
35
36	EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
37	'${GTKDOC_DISABLE_FLAG}', d)} "
38		34
39	# This avoids the need to depend on target python3, which in case of mingw is not even possible.	35	# This avoids the need to depend on target python3, which in case of mingw is not even possible.
40	# meson's python configuration pokes into python3 configuration, so this provides the native config to it.	36	# meson's python configuration pokes into python3 configuration, so this provides the native config to it.