diff options
author | Ross Burton <ross.burton@arm.com> | 2024-01-10 13:07:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-12 11:54:05 +0000 |
commit | e7ce961d369c3e5ae813d962303d419510a3f6e6 (patch) | |
tree | e9de4cbbecc5b3031f06d10c92149bfa8387dd8d | |
parent | 0971cf620c863d69f9b266b2c4958bb28c487a7a (diff) | |
download | poky-e7ce961d369c3e5ae813d962303d419510a3f6e6.tar.gz |
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>
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch | 21 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch b/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch new file mode 100644 index 0000000000..f56c2b8564 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | docs/reference: depend on a native gtk-doc | ||
2 | |||
3 | In a cross-compiled environment we don't need a target gtk-doc, but a | ||
4 | native gtk-doc. | ||
5 | |||
6 | Upstream-Status: Backport [f3ff370d1b24f8afb51cd4e865593d5b678188a9] | ||
7 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
8 | |||
9 | diff --git a/docs/reference/meson.build b/docs/reference/meson.build | ||
10 | index c417ffecb..67c1dda56 100644 | ||
11 | --- a/docs/reference/meson.build | ||
12 | +++ b/docs/reference/meson.build | ||
13 | @@ -42,7 +42,7 @@ ignore_decorators = '|'.join(ignore_decorators) | ||
14 | if get_option('gtk_doc') | ||
15 | # Check we have the minimum gtk-doc version required. Older versions won't | ||
16 | # generate correct documentation. | ||
17 | - dependency('gtk-doc', version : '>=1.32.1', | ||
18 | + dependency('gtk-doc', version : '>=1.32.1', native: true, | ||
19 | fallback : ['gtk-doc', 'dummy_dep'], | ||
20 | default_options : ['tests=false']) | ||
21 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb index 13d4b38e22..2729b2a596 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
14 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ | 14 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ |
15 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ | 15 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ |
16 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 16 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
17 | file://native-gtkdoc.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI:append:class-native = " file://relocate-modules.patch \ | 19 | SRC_URI:append:class-native = " file://relocate-modules.patch \ |
19 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | 20 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index eb292c51d4..ae6fc51992 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -30,8 +30,6 @@ 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 | 31 | inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages |
32 | 32 | ||
33 | DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" | ||
34 | |||
35 | GTKDOC_MESON_OPTION = "gtk_doc" | 33 | GTKDOC_MESON_OPTION = "gtk_doc" |
36 | 34 | ||
37 | S = "${WORKDIR}/glib-${PV}" | 35 | S = "${WORKDIR}/glib-${PV}" |