diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-03-13 13:01:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-15 06:27:19 -0700 |
| commit | 29c6083d1fc2fb7d7bcc55841db3fc758d38b796 (patch) | |
| tree | d040987db135d20232c8e1de37a98c8db9eff99b | |
| parent | 508ab8b836a5e69737539d0e0e3d828c936d4407 (diff) | |
| download | poky-29c6083d1fc2fb7d7bcc55841db3fc758d38b796.tar.gz | |
gtk-doc: always inherit python3native
My attempt at only inheriting python3native if it was needed was broken and
didn't work, so back it out and always inherit.
(From OE-Core rev: eb08ce66cf7ca6dbdb51fb9b9725267606fba6b9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/gtk-doc.bbclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass index b8db4280bc..3f731cb93b 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass | |||
| @@ -28,10 +28,8 @@ GTKDOC_DOCDIR ?= "${S}" | |||
| 28 | 28 | ||
| 29 | export STAGING_DIR_HOST | 29 | export STAGING_DIR_HOST |
| 30 | 30 | ||
| 31 | inherit ${@oe.utils.ifelse(d.getVar('GTKDOC_ENABLED') == 'True', 'python3native', '')} | 31 | inherit python3native pkgconfig qemu |
| 32 | 32 | DEPENDS_append = "${@' qemu-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" | |
| 33 | inherit pkgconfig qemu | ||
| 34 | DEPENDS_append = "${@oe.utils.ifelse(d.getVar('GTKDOC_ENABLED') == 'True', ' qemu-native', '')}" | ||
| 35 | 33 | ||
| 36 | do_configure_prepend () { | 34 | do_configure_prepend () { |
| 37 | ( cd ${S}; gtkdocize --docdir ${GTKDOC_DOCDIR} || true ) | 35 | ( cd ${S}; gtkdocize --docdir ${GTKDOC_DOCDIR} || true ) |
