From: Ross Burton <ross.burton@intel.com>
Date: Tue, 13 Mar 2018 13:01:39 +0000 (+0000)
Subject: gtk-doc: always inherit python3native
X-Git-Tag: uninative-1.9~176
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=eb08ce66cf7ca6dbdb51fb9b9725267606fba6b9;p=openembedded-core.git

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

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}"
 
 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 )