From patchwork Wed Mar 14 11:22:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 131572 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp736063ljb; Wed, 14 Mar 2018 04:22:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELvyU5iukNCPSFRd0I5Nv7Ij9TwEx5dI5gULdu+5j8Iv0dE5VWUcYsIpAWn0hTDHgXd6QEUB X-Received: by 2002:a17:902:8691:: with SMTP id g17-v6mr3661185plo.7.1521026575619; Wed, 14 Mar 2018 04:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521026575; cv=none; d=google.com; s=arc-20160816; b=jl7cBXG45dv0HyEUkF+/M4dcZphY8zbA7pnKPoa83/Sw7FwMuAzzY2cZt1LDYZlxrW 8hpwKeo9TqlWbTEj/mO5S02DPbGsux3KxRrfoO+mOMrCnYatCbKAMD1t8jpyUCNiunl2 /WrSYwOKIDFi6wPtguI1t0nEHXWnf0z91E2z0IS2plJxvGml5PmJtq2xe42I1c2iaYmr MMz6JVcPOHGgclCI84OPGhCM1FjKWiBJUHFfiLoaqacrOnJiqnsye2w7GKZLB4BdmoMY ajTrPCVQ71922RdEDa1W8GQbROQDPIJ28EeGoJwXSz8RxKqTHHhQiZC72Awy978v7yE3 TlAQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=GOnuq3gO1VO/wXbB8p19cCyl56jyWh8+6DfbilMtTbM=; b=a0yufBXhWeXP3PTrvQYu+RDVr0O7FFaQ0mE66OUwUXdKt9sTna9Fhr1WEPMKNNKFgm 8NEbkoW8pdW8axHMM5wki8NKSvaU0senpzwsU+YyPuSUNv9/rQOsBwS2Im7jMZO6E4xC kkF4f6lJDs1HFDjg8l1WuepsXGJw40asPBXhgFLhE8ScmOySAfCDV/j+lmlrsajRghYS zhR+sKTOOdLP/1HBoQZ1TfXO7vFeFnQRNYUg1zs8Vh1WOm7Hk524fkKtJZHJ9UeXiSKu PRKGwrRCjxpAZrunKGXYdKzumCbqG/dG1BZM6etjBrWg+181jTH44zeszfTyyXRxO9Qy URLA== 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=0hKiaePB; 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 w16-v6si1807912plp.87.2018.03.14.04.22.55; Wed, 14 Mar 2018 04:22:55 -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=0hKiaePB; 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 BDD93788CE; Wed, 14 Mar 2018 11:22:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id E950E788AC for ; Wed, 14 Mar 2018 11:22:28 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id o1so4314901wro.10 for ; Wed, 14 Mar 2018 04:22:30 -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:in-reply-to:references; bh=6AVRZt5N5CqyfoAorw0p8773zfaBvWwBXLUkqNSDu4Q=; b=0hKiaePBugTOmN66/KTfolmuKku13NIGprSXUlZwTJSuPKgZQQ79MEhrIGWr175ykU pTEqXrHzFSCg396U9zLyQMLCqK5Yb4HFbyZ291djtXsqFEafS2rYPz6Ag51rids2jouz PkZ1xtEHAcFWMLmfXXuhndbGmzfpdr5OM8W4FFZ6cEcwZHCFnF70nD2v1oeR7BEIU7Gf XpwpezQ+V1i2t7Kq5tZ+scXAmtsQwJFcs64xU0p2uEs8SITAKRPTYBq8YYR+dOsF84Rl i3P20qsTxVinw+0rl51HtJ2DsYG/sdc67q3253KcFskCbYVoG+5CvYzQ22fEzLb42be0 sY+A== 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:in-reply-to :references; bh=6AVRZt5N5CqyfoAorw0p8773zfaBvWwBXLUkqNSDu4Q=; b=cxWZb2FXtvkhDbsFVsEy0t+z3Ap2r15jCEf8QJi7X2UeEQsKxq2ZY/P9RpWINKynti iccI/BRbP2GYdOQxNyhHFTPWlhKu8fky1OSms/mB+jI9assypK++Hw+nzv330u4qJeLQ PpzdQGaRHFa5xlUwpMizgfBYrlcEPXHZCRvoydagHwGyMHz9RD2uHbxec2woj6AZOgWZ UmKBGlJGG5I8U41KtnNyMskUgD6jee9sx6IPgF0v9V78Hgp+zpGarv7zdXdRNe1J9XCU 9MAKrXZq44SXa32JIfbDy/1YtfTJB/ohwAMj6Ep9shHPvfp0RYXsypZEupqEmgLIRnPl +Z+Q== X-Gm-Message-State: AElRT7EInCgNXXhMtE5J7H3afdAfXGCFduemV5XcEQLOFA8Bl4RetqCc 9XU82P7p1ZrP1soDcojQRtPn2D58 X-Received: by 10.223.170.152 with SMTP id h24mr3412339wrc.102.1521026549256; Wed, 14 Mar 2018 04:22:29 -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.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 04:22:28 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 14 Mar 2018 11:22:25 +0000 Message-Id: <20180314112225.22192-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180314112225.22192-1-ross.burton@intel.com> References: <20180314112225.22192-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] gtk-doc: improve calling of gtkdocize 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 gtkdocize is only needed if the recipe is using autotools, so instead of hiding all errors from it, only run it if we're also inheriting autotools. Also instead of cd'ing into ${S}, pass --srcdir. Signed-off-by: Ross Burton --- meta/classes/gtk-doc.bbclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 3f731cb93bf..cfeb49a1d00 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass @@ -31,8 +31,15 @@ export STAGING_DIR_HOST 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 ) +# Run gtkdocize if the recipe is using autotools +run_gtkdocize () { + bbnote Running gtkdocize... + gtkdocize --srcdir ${S} --docdir ${GTKDOC_DOCDIR} +} + +python () { + if bb.data.inherits_class("autotools", d): + d.appendVarFlag('do_configure', 'prefuncs', ' run_gtkdocize') } do_compile_prepend_class-target () {