From patchwork Thu Mar 15 10:43:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 131762 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp936369ljb; Thu, 15 Mar 2018 03:43:18 -0700 (PDT) X-Google-Smtp-Source: AG47ELtHJsWlEqg3h6tbvJAMcjo2f9ME6P95PDFrpfV1ejepCggQuo+CNOmTNF2Aiz7TjDHnrVv4 X-Received: by 2002:a17:902:47aa:: with SMTP id r39-v6mr7599106pld.72.1521110598230; Thu, 15 Mar 2018 03:43:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521110598; cv=none; d=google.com; s=arc-20160816; b=hM7XnCwfh6zmwZNmAUsLwSVl5QGVlDRRiJfU7lRJHJvuOBMJmTCyDfLc/fGVYc7GP7 Wgrd/omlKSSNd4SubPMlYQrZI9fR0F2K0kNc/VtTVGY2c1Qi5wZHkIZaUhBRIiKB3djX VXwvvkdCNy0pPp3034gNIh05GqMX9+ME7GqaDBb52SJ7QviemQ0botsL0uX4PDDult5m z0wpxTx16r7RKEHghs9lspN8RsMLSC9ra2+NYkZkyeCZKQ//SBZH7YpYer22bQwu1KJu TsiKjnRCcbvOnKssKCK9wUDegvUK9pVsMlIXHF1D2B7TgDto0J4pKHkSFIywZ/uAQ//P TxZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=w1IZ2jGdmbNta5+oNh6Axntkd7fEWVEzoLHJbM0+A4o=; b=FPBsOo8kNFi/qj2v9gtor05Ug2bE4IzfsyechHQ8OuzPZYrdXG+f/fSuc0We1RlIQr KMCv/V1MCDCczBrnyE/ztcJh88rPQ2evFqQHTR0ybOXF1E/BgNyNNDqIOLhl7xy9Vm6s NL9W0Ydlzmin9MS2y2rTxlWppUEytsYEam/Nga72IcXVUPMp6u+9Dr6KR7dJ+LM2LJBn SK2ZDDDLVkD0gqcS+kMuYPu+OrW8KDSzFUM+WL3tgdm8N3bUdjAPDtffpP5fynBkMlT4 nJmmu4ifbRdGDAgkM+vDQnOkIyPTuBKhDRmAw4eUoRvRGf+Y5cwXqHIXyLZx7GfyecZF AqgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=oIUG0IMk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m8-v6si3856012plk.593.2018.03.15.03.43.17; Thu, 15 Mar 2018 03:43:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=oIUG0IMk; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 362BE782CC; Thu, 15 Mar 2018 10:43:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by mail.openembedded.org (Postfix) with ESMTP id 4EFC0782CC for ; Thu, 15 Mar 2018 10:43:08 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id k3so7738205wrg.6 for ; Thu, 15 Mar 2018 03:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=Z5SdF3k+/pv6iK+5ijt3hPOmzACku23wWGGv3hYRPQU=; b=oIUG0IMketxnZ+/cTdid8nPJSA6IAcmwxuPOinz8GQIWASXPYq6G1+OWeqKnT+dvuE qK1Cm0KX1zIRKuKPZaU+bvPr3ZR0XBqVfLTweTIOFpvxEQUfSk2XDBu5RxUREXorYrn4 HrsQiK8Khz/3s4PPZAmwe9Cmh/XDR9qI6L4/bWzvYRTJCKXjbCSR81Y0kJPja90faASt 4F6o1UVAVafFdg/LNaMLH+5ODcr1YzGeBjD1e5JfVAAvwIlzWvw8sPJzH22lSggfZATF Uy5uIGa96UV7OXto4NV7sEg5TJ7MlkrmcSb4HnOaaQqQQ00FsIdV7zQ1X+kl/6CYi2+7 WlMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Z5SdF3k+/pv6iK+5ijt3hPOmzACku23wWGGv3hYRPQU=; b=XT5GvqCjGZURAf+7q5PPJ+1ciPtotlKFyQ8hHFiApU33Z1mCqUHk3xSQ93mreLBRae uHUoWywOkOagAYVGomN2/Bl9GPSBVbfm41703zUBjOKP2JmrlnB7iib3wmmwX8MoMI4S u1qYoAp0/gIFbOADahbN/E/8Uj4daHITxcTgzXRidvHpvL06peTSgOTjAcjvCdYqEDW3 ejmGQ+KxvW4XIq0PFac5aBuxSbKlWxhkvfcXrE2H5Z0k/LeRmese76zUprhq7wpuvauy snFe4EoepV/XOlXHFebMAR4UcMC/c1npKVuVIl1UDlc4oV+1052yb8af8e9aRPlAQnXN ctCA== X-Gm-Message-State: AElRT7Gr4rogKs72B/P/7z3ma+aSaNxKu9EV2Vxkv1vzWHDawsXmvbfI 2xvC38L95N40xjzbqiSh32nJ39VY X-Received: by 10.223.189.133 with SMTP id l5mr4638636wrh.69.1521110589668; Thu, 15 Mar 2018 03:43:09 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id q16sm4261667wmg.3.2018.03.15.03.43.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 03:43:07 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:43:03 +0000 Message-Id: <20180315104303.14908-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] gtk-doc: always inherit python3native X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 --- meta/classes/gtk-doc.bbclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass index b8db4280bcd..3f731cb93bf 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 )