From patchwork Wed Mar 14 11:22:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 131571 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp735694ljb; Wed, 14 Mar 2018 04:22:35 -0700 (PDT) X-Google-Smtp-Source: AG47ELtrtKWMwGyiwzTCa/K9GQehOs1n3UM0uHjeYfWAHobviO+Ui+sMgDEhxmcONRDxhJWTGsxX X-Received: by 2002:a17:902:149:: with SMTP id 67-v6mr3816196plb.296.1521026554865; Wed, 14 Mar 2018 04:22:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521026554; cv=none; d=google.com; s=arc-20160816; b=NmV9G8P093rHkje74WyLbanQDcfZAPBjeBRdtQtZqBFlJnBCAAnZIvvsI6DNiGBY4v toJi/EUBmb9N1hiB1r6aOaxjMRIITTtnh0dbZ2eyKqAY23hrALg8/TiAltnM/6eE3RI2 CnxS2spXCvoHcv3uqQjaagWDJzYXOjjUmvDuUPeoQRiVyV+VDbEY/1FeIoDdYSV9Dxn8 wg8D0aRIyk2Jbafxi85YhgQoEWCtfaaDY+Ves1HDUILzwlasid7oV5PtaeoWGXzPbiN3 lgj1y2TayIL8ckqyQgQtyImDkOmbgXvHPHPdWBF9R/h4rnneQujzUBjOqrwRDnFpANSB HuJw== 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=gQu1jUUnSpNcj+OA5xOUyhONaV5EcrJhti5OMCvIqjTSd6ISjQSN3yvr0CigZ3rg5+ rUnkSjSxfhDq9L3/qPFUeK4gnq6duMVKS4T0etOJDGGeSvx92z+JMoDidWvCXrxFtYWn vvmBtrehNb0LEW+qmM5dfRGYPWy56Ra9E0umWwL1tef5CUq/uV+2dYK89I3nQuUkAkUB MRcKcGlHpDd4f3DKf2V8hp5vH12RJFa3GrPVhRgyC1q3Tow8X2JESpAAQPzS+tQ91Kcb c23k1Rq1z8xIlCmC7J00MlH2Old1sLZNTMXG8EVER2d2l5HVC1Q4o+xHZOMwzmjxjJuA C8fQ== 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=ksX4AcMo; 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 b1si271763pgu.764.2018.03.14.04.22.34; Wed, 14 Mar 2018 04:22:34 -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=ksX4AcMo; 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 DBCA7780AA; Wed, 14 Mar 2018 11:22:29 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by mail.openembedded.org (Postfix) with ESMTP id A1116788C2 for ; Wed, 14 Mar 2018 11:22:27 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id x7so3284669wmc.0 for ; Wed, 14 Mar 2018 04:22:29 -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=ksX4AcMow5ggwVM1pDP7gUPIvVKalPN4CX+ri2eNCQgTfhTdeFeJeuHme4MgWKjUva vcft8jf1AHRdDkBfgCbsG37qWv5qgQk2ULeyCCifK7RjEjYxWaGaLZV+wro0EXd0yreN AWML8u1r6ja4n0cq6o3wElDOxEwLFKR4lHSO5Fuw+uK3uaAZpU3+lC+sEMFCT83Bkito yMIWMdoyDnjTFXh4z3K+E9ZD0CGXgY9DGMqLKzUQnR9HiSMANF4T+T/fGfX9iLsjtuZY +EiQSOgmiuXXTDdIxgsVEISalgqEZAsre9yuzso5IViLAstzNJeUBb2quzatzaW4/6nu hxXw== 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=XuNIHoDMNTvH7mZM3k2/VRnG4sM0D7PFQQ/ldUBe+DGXvPOVRCfAbC4Bue4hR1n/c7 6YQo+nSKEQfVhM42kUGSJg4wI64xkp6qq7NKOgCRynxxjo8Be0EtZvbhFO/4QBh78Zav zAsjdZ8rHQrLgVHPtifVhoHjuy2P4c9ZTaR92zLzNxYComyW8rQEHGjiz4CysOPpKzQt fQxsGoKHm+BMoVZgYUHziVUOoZmOaKP4vx3XTqI7+MB8f6IOx3zJKTg9yhZ4/kl+gsCe FcEvsr7EQU13XzEDzMRTP3ng+slVS3m+1FgPhbCwY04yvdtYN/zqglHXXiA/IHgZmhU4 2NzQ== X-Gm-Message-State: AElRT7F5MEBgR7joxwmjHhQEYiEOOf+1/yPlmjRwlpOr5/UKmzdtAPOQ DM1ufDSfT+Dq+/caEAjNELCOXvrl X-Received: by 10.28.155.66 with SMTP id d63mr1293532wme.144.1521026548293; Wed, 14 Mar 2018 04:22:28 -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 z197sm1703522wmz.24.2018.03.14.04.22.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 04:22:27 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 14 Mar 2018 11:22:24 +0000 Message-Id: <20180314112225.22192-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] 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 )