From patchwork Wed Mar 7 13:42:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130893 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5196557lja; Wed, 7 Mar 2018 05:42:19 -0800 (PST) X-Google-Smtp-Source: AG47ELtp/rcL7x0J3B7y657T1wTd++gbIO+AENdRHmPkStb355fUkyXYE+88GWrtCNYwrq8ZS5Xr X-Received: by 2002:a17:902:bb06:: with SMTP id l6-v6mr20356513pls.394.1520430139395; Wed, 07 Mar 2018 05:42:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520430139; cv=none; d=google.com; s=arc-20160816; b=waw5HIYie2xBJLi7QdwNsB3W0p1SP7IKccr2RP+hiPPzNmzbZd+XThDueZf1JmpqVe V2SgDinFz+JJ0PnLPyJGCPkmOphlPsOtiPyLL5+rQOD7Q0AfDlpQMXdXJRkh6okzUnu/ x8OWbn7uEDAyCS6EntY26Sg9mEv3p5XQwR4A1xKD57HdaLqVZgkdvC9lm41KGm/L1s40 xhkjM06upsapFupEGov2/uToJoQyVbmwymDqHRhNFm+MoxmiclkkD+/OpEIbNNGKB73v Z6c7J6MS8S2CLlha17vkWKLQ2lM6Q0EGIPcwG2RG1LhbqjsxUYi1aidj1DWWWADvdIbr b4aQ== 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=8RITk10IlWHsVxIwZvdysPCqEHXvmexD9k1u/tljMT0=; b=TIKK3zDVhChmrCAEpg5pmAOdKElzynO+O6ugkglPdEXwXvpY/WyNmMfIaY9grW99jX p5NeZc7Y42vRbpE+sgB6/LzVP52BLcq3/qXdYuT7b3NPHFsM2ImrqsKurw9tYEdG0MQl Hcn6BZ1zg2tlhxooCpQAsXiaDcE7f1H/BDcsF9PGvPEbIoUxJ3xEzr7o1AC8NapZNMgz PehIvYGlFdVwPzYXoTpktqqapASbYJpqEQV/dd6pHJMjJJSAeO/7oRUx/cK4ZZphkW2o tMa5T8jzXd+7rkX5Q1jySGMScc+ryRwwSFJWssCj7lrZ509rkUBw/Mt0CXkYTXQ4sO9b iJag== 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=VYWZdivH; 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 r22si13802780pfj.140.2018.03.07.05.42.18; Wed, 07 Mar 2018 05:42:19 -0800 (PST) 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=VYWZdivH; 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 9CA67789D5; Wed, 7 Mar 2018 13:42:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id 3CF7278A02 for ; Wed, 7 Mar 2018 13:42:14 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id a20so22802593wmd.1 for ; Wed, 07 Mar 2018 05:42:16 -0800 (PST) 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=1XqJUt7wvD0du6oamcIw5kt7bRQ4I/VZ4sC6dWYiZEk=; b=VYWZdivH5JxG/TQbpITe41IC5bbxC/PYY5l39P+KkxXeYIptqDZEzRby0AFX+zRJFS ojNHSQ9Q1JFBO92b7iQkfRP7ufqXnzgLxRtOj6HMsVAES356f2y3LWjU5YXP0PE7I4vm PoUesOQ2VxpnFqWOqo9yVcKoDmBUeOlgqla+1wS9oES2bgSMWNWsRI/WuBcoO/gLAzQg A99zwow8iagSif491JLAuqpikPJvVKDWLq8bLiXvuY2Pj5izmOVEcfosyj092Z/qk0lG ETP5D7chVL73KDQI028KJctMvuwl2P/ixO5i2myPjHaUggblWL8EmXD5aiBmmoTupmCL jWaw== 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=1XqJUt7wvD0du6oamcIw5kt7bRQ4I/VZ4sC6dWYiZEk=; b=V5BrBtawksHR/q8lL4Fg+WtHSQcxEvsFNedX+EaEFrie3dOWb5dugoWqJg2q1myUJh 6vhvb5K0bFVHuUKKt2winMcwuWrkHBbYzemyZEjGm5jsMn0rqDPALl4KDtR8DMtGHjDj vZq8hzOqyqiootAGhIkj2/bh+QvuwS50WO1shKq1OywHhoUxdmkZjfH9LpbQT9Bd9AFq oNt7EyTG4jC/zXwK07medbJoS8mfIvMmlVwwuCMpY/wpHg2X0z91LMzqPI6sbreLB9at zCyiuwTGr4/93NRyNsDpCxtuyHJBxuXhjU/DoJSxlbyAnSGrXFZZdZ90pIVwic8vdDUp KyZg== X-Gm-Message-State: AElRT7Eb88AieOcQtatscvyECffdhT46aDQzFCAjXyn5D8JIhnkv73uk 8n1wa8BJpuyqjKz8+qNupQg/m3RL X-Received: by 10.28.136.18 with SMTP id k18mr15465710wmd.111.1520430135729; Wed, 07 Mar 2018 05:42:15 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 10sm26288152wrv.95.2018.03.07.05.42.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 05:42:15 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 7 Mar 2018 13:42:13 +0000 Message-Id: <20180307134213.24763-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] gtk-doc: inherit classes only if gtk-doc is enabled 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 Respect GTKDOC_ENABLED when inheriting python3native and DEPENDing on qemu-native, as they're not needed when disabled. python3native is required as otherwise the host Python is most likely used which may or may not have python3-six installed (a requirement of gtk-doc). Signed-off-by: Ross Burton --- meta/classes/gtk-doc.bbclass | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 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 5201c7151c6..b8db4280bcd 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass @@ -18,27 +18,27 @@ EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GTKDOC_ENABLED', 'Tru EXTRA_OECONF_prepend_class-native = "--disable-gtk-doc " EXTRA_OECONF_prepend_class-nativesdk = "--disable-gtk-doc " -DEPENDS_append_class-target = " gtk-doc-native qemu-native" - # Even though gtkdoc is disabled on -native, gtk-doc package is still # needed for m4 macros. -DEPENDS_append_class-native = " gtk-doc-native" -DEPENDS_append_class-nativesdk = " gtk-doc-native" +DEPENDS_append = " gtk-doc-native" # The documentation directory, where the infrastructure will be copied. # gtkdocize has a default of "." so to handle out-of-tree builds set this to $S. 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', '')}" + do_configure_prepend () { ( cd ${S}; gtkdocize --docdir ${GTKDOC_DOCDIR} || true ) } -inherit qemu - -export STAGING_DIR_HOST - do_compile_prepend_class-target () { - + if [ ${GTKDOC_ENABLED} = True ]; then # Write out a qemu wrapper that will be given to gtkdoc-scangobj so that it # can run target helper binaries through that. qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" @@ -64,7 +64,5 @@ if [ \$? -ne 0 ]; then fi EOF chmod +x ${B}/gtkdoc-qemuwrapper + fi } - - -inherit pkgconfig