mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
glib-2.0: no need to depend on target gtk-doc
The meson.build looks for a target gtk-doc, but it should be looking for the native package. Fixing this means we can drop the need for a target gtk-doc package. (From OE-Core rev: f91694fa8f5c2c3e6f4946300f040677cb0828fd) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0971cf620c
commit
e7ce961d36
@@ -0,0 +1,21 @@
|
||||
docs/reference: depend on a native gtk-doc
|
||||
|
||||
In a cross-compiled environment we don't need a target gtk-doc, but a
|
||||
native gtk-doc.
|
||||
|
||||
Upstream-Status: Backport [f3ff370d1b24f8afb51cd4e865593d5b678188a9]
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
|
||||
index c417ffecb..67c1dda56 100644
|
||||
--- a/docs/reference/meson.build
|
||||
+++ b/docs/reference/meson.build
|
||||
@@ -42,7 +42,7 @@ ignore_decorators = '|'.join(ignore_decorators)
|
||||
if get_option('gtk_doc')
|
||||
# Check we have the minimum gtk-doc version required. Older versions won't
|
||||
# generate correct documentation.
|
||||
- dependency('gtk-doc', version : '>=1.32.1',
|
||||
+ dependency('gtk-doc', version : '>=1.32.1', native: true,
|
||||
fallback : ['gtk-doc', 'dummy_dep'],
|
||||
default_options : ['tests=false'])
|
||||
|
||||
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
|
||||
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
|
||||
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
|
||||
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
|
||||
file://native-gtkdoc.patch \
|
||||
"
|
||||
SRC_URI:append:class-native = " file://relocate-modules.patch \
|
||||
file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
|
||||
|
||||
@@ -30,8 +30,6 @@ LEAD_SONAME = "libglib-2.0.*"
|
||||
|
||||
inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages
|
||||
|
||||
DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
|
||||
|
||||
GTKDOC_MESON_OPTION = "gtk_doc"
|
||||
|
||||
S = "${WORKDIR}/glib-${PV}"
|
||||
|
||||
Reference in New Issue
Block a user