diff options
| author | Ross Burton <ross.burton@arm.com> | 2024-01-10 13:07:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-12 11:54:05 +0000 |
| commit | 614b228d0ac76cdf7bee59073b3be2eef1bf164c (patch) | |
| tree | 8bfff661c5ba36d401c56060942d5d2ab4f24df8 /meta/classes-recipe | |
| parent | 1cf26ed78b35169ebfed02597582bb6671d6e157 (diff) | |
| download | poky-614b228d0ac76cdf7bee59073b3be2eef1bf164c.tar.gz | |
gtk-doc: remove obsolete logic
This manual disabling of gtk-doc for autotools and meson in native and
nativesdk builds is replicating logic above for target builds.
Instead, use one assignment for all builds, as we explicitly disable
gtk-doc in native builds and it can be useful in nativesdk.
(From OE-Core rev: e13b019c61d86f1add32f23795f6e71110c6a70c)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
| -rw-r--r-- | meta/classes-recipe/gtk-doc.bbclass | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/classes-recipe/gtk-doc.bbclass b/meta/classes-recipe/gtk-doc.bbclass index 68fa2cc745..c980c6bb52 100644 --- a/meta/classes-recipe/gtk-doc.bbclass +++ b/meta/classes-recipe/gtk-doc.bbclass | |||
| @@ -25,16 +25,9 @@ GTKDOC_MESON_ENABLE_FLAG ?= 'true' | |||
| 25 | GTKDOC_MESON_DISABLE_FLAG ?= 'false' | 25 | GTKDOC_MESON_DISABLE_FLAG ?= 'false' |
| 26 | 26 | ||
| 27 | # Auto enable/disable based on GTKDOC_ENABLED | 27 | # Auto enable/disable based on GTKDOC_ENABLED |
| 28 | EXTRA_OECONF:prepend:class-target = "${@bb.utils.contains('GTKDOC_ENABLED', 'True', '--enable-gtk-doc --enable-gtk-doc-html --disable-gtk-doc-pdf', \ | 28 | EXTRA_OECONF:prepend = "${@bb.utils.contains('GTKDOC_ENABLED', 'True', '--enable-gtk-doc --enable-gtk-doc-html --disable-gtk-doc-pdf', \ |
| 29 | '--disable-gtk-doc', d)} " | 29 | '--disable-gtk-doc', d)} " |
| 30 | EXTRA_OEMESON:prepend:class-target = "-D${GTKDOC_MESON_OPTION}=${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_MESON_ENABLE_FLAG}', '${GTKDOC_MESON_DISABLE_FLAG}', d)} " | 30 | EXTRA_OEMESON:prepend = "-D${GTKDOC_MESON_OPTION}=${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_MESON_ENABLE_FLAG}', '${GTKDOC_MESON_DISABLE_FLAG}', d)} " |
| 31 | |||
| 32 | # When building native recipes, disable gtkdoc, as it is not necessary, | ||
| 33 | # pulls in additional dependencies, and makes build times longer | ||
| 34 | EXTRA_OECONF:prepend:class-native = "--disable-gtk-doc " | ||
| 35 | EXTRA_OECONF:prepend:class-nativesdk = "--disable-gtk-doc " | ||
| 36 | EXTRA_OEMESON:prepend:class-native = "-D${GTKDOC_MESON_OPTION}=${GTKDOC_MESON_DISABLE_FLAG} " | ||
| 37 | EXTRA_OEMESON:prepend:class-nativesdk = "-D${GTKDOC_MESON_OPTION}=${GTKDOC_MESON_DISABLE_FLAG} " | ||
| 38 | 31 | ||
| 39 | # Even though gtkdoc is disabled on -native, gtk-doc package is still | 32 | # Even though gtkdoc is disabled on -native, gtk-doc package is still |
| 40 | # needed for m4 macros. | 33 | # needed for m4 macros. |