]> code.ossystems Code Review - openembedded-core.git/commitdiff
gtk-doc: always inherit python3native
authorRoss Burton <ross.burton@intel.com>
Tue, 13 Mar 2018 13:01:39 +0000 (13:01 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 15 Mar 2018 10:38:48 +0000 (03:38 -0700)
My attempt at only inheriting python3native if it was needed was broken and
didn't work, so back it out and always inherit.

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/gtk-doc.bbclass

index b8db4280bcd9a6bb2c4664c2b3b52c6410caf7ab..3f731cb93bf37bf47569ca54fe10884caec3934f 100644 (file)
@@ -28,10 +28,8 @@ GTKDOC_DOCDIR ?= "${S}"
 
 export STAGING_DIR_HOST
 
-inherit ${@oe.utils.ifelse(d.getVar('GTKDOC_ENABLED') == 'True', 'python3native', '')}
-
-inherit pkgconfig qemu
-DEPENDS_append = "${@oe.utils.ifelse(d.getVar('GTKDOC_ENABLED') == 'True', ' qemu-native', '')}"
+inherit python3native pkgconfig qemu
+DEPENDS_append = "${@' qemu-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
 
 do_configure_prepend () {
        ( cd ${S}; gtkdocize --docdir ${GTKDOC_DOCDIR} || true )