From patchwork Wed Mar 21 16:40:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 132245 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp2362393ljb; Wed, 21 Mar 2018 09:40:59 -0700 (PDT) X-Google-Smtp-Source: AG47ELtHGuDn/Bxd2wLXaHxFq9LiQIpuc+LkdQCg8bi9+O/Ccktj4v5zgVqO/3dgvGMvV3gx98mD X-Received: by 2002:a17:902:2e:: with SMTP id 43-v6mr21377702pla.282.1521650459024; Wed, 21 Mar 2018 09:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521650459; cv=none; d=google.com; s=arc-20160816; b=ZLPx3N8DE7JyNE8yWom7zEurPtJz0lr/BVuDMToWYA7qzlonbNWjL9XNbKiJpp0Ii2 OqyowEejXUeyBSZM4MGglOC/D1uAmM4jI+JaKnnFCyzIhBtjllAVLvDUClFijgQXiHqe p3Xrx1v9DoqvTEaFqpL5TVRclvvco97LZuSVV5ANMdqk6nDfD1lW/v60zXpjBA9TMLSz i5Sd1ktu98eJwKPA1mq2L7eEB0rtqlFymuAmBrOSBxpK2IYITVqSe+zIY0kyNQCoAZgi IHMTfgEPipO4Sr3tKnwYLgMlP8/0pXH1JeuByQuumFfe+Wcl80F+ZvvASj9prSDdwGHC 9e1g== 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=bgw5CsgN4uwKIriVSUEuY/CPyYihyvHYkmqP70A5yjw=; b=rcuxME/bEbG7zce5vFoLm97m3XOt8VXnw6DeoSfkBV1r0M8l3UkWlNqwzgasQa8UiJ 7bAVLCDE/445daun4b4KCNfrViPX7XkCq8GgpRkv/0WrtKrG7Pmjr1r05mDDr7CDhWwM X1r6M7E4mZCcfhmhPFMgWCdSLM083DLXTYyHMY+28B0X71jIf1D5NMqk/u1ck+FvaP67 /DCqOAoaCO4gUZgZaXJ2iMhrHj61hpKVprHmbZYdhSsqSu2YXxva64ITG42t914RyDrr aVSp8ISxFjtqpeBWQzVvYmKCvJ7NdtMWcOdlhSNmHwP1XnOFXoyqiO/6lIXYqOLF7icm yfHw== 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=ot24ZwNh; 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 v13si3079608pgq.478.2018.03.21.09.40.58; Wed, 21 Mar 2018 09:40:59 -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=ot24ZwNh; 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 90E3678963; Wed, 21 Mar 2018 16:40:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by mail.openembedded.org (Postfix) with ESMTP id 921B578984 for ; Wed, 21 Mar 2018 16:40:53 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id t7so10936754wmh.5 for ; Wed, 21 Mar 2018 09:40:55 -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=lU48sTuvtOUOr9xhd7xiURuu1ZDgXyGjRTA3+pb+/xI=; b=ot24ZwNhR6vWA22DHljYoz0EwjiP8glMQCTUnNnXRpEoFe223GANwhppMxfKqIFdZ0 vTdGn4CRWlUPKSpBF0SufSQ43twpc7yVaaqu/TUfOhYWoaXcuRfnx8EeOa2HmCoKrdZr g+PMk/Ka8gsBnIz2qg8oavebJfqtH037zBsSBqi2+zGUHf7BH8fjXpUDCOad4NZDyl1T u6/MHk90I/O6lAHiZdSEkj0i8oAJ2Kq6duEl9gy7epwe6i4sPqoUCVsaqr6x7qdDKVkK VrRR3WYaXn2DfZyXYY+BvHowk4yImUcz/KYVlqOgjXx+o8cR5JqlHZtjVqsb9KRkkxNf 1plg== 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=lU48sTuvtOUOr9xhd7xiURuu1ZDgXyGjRTA3+pb+/xI=; b=hyHheMOiu3VdgUjJDhpFhfgVcZ1qPhN+HaONwjwih4rYaQAwwK5UliTRvIHT3WqTUZ j1rtO0jcUJTH1dbtwRyVnYWbL1MANLjfvK5uNCQ5IybGfAslIcRtYZqwrVsMSjFXKY/R qX89rdyoFzy6LhblDtYer/jMtWHPRLcQQT3gfnTxBMS8iBwS/PrmtVMt2xs4h/OVbqr7 Olz0KFnxJwtIlH2QrZmjGUplEHRuOdZekZ5VibnlRqJwE43IEZqnjIvSLZFrErYr6ZUG WNA2/yNk265vlfKBkDauyyJxiAoNchZOU61yOzwU4E0CTpkQpxZUIw1citJv8rsC4gl/ 6UgA== X-Gm-Message-State: AElRT7G5+akY6Nu8t0OuA5EG4ljXD/+dUIoAtS6HT8L5UMufbcgIvmdU kWrolEexRTNagLkjvtweIesfsjEp X-Received: by 10.28.19.13 with SMTP id 13mr3458378wmt.89.1521650454004; Wed, 21 Mar 2018 09:40:54 -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 x78sm8055164wmd.2.2018.03.21.09.40.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 09:40:53 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 21 Mar 2018 16:40:51 +0000 Message-Id: <20180321164051.22869-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] gtk-doc: don't regenerate gtk-doc in do_install 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 In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir. However, if some of this content is regenerated at configure time this can happen: 1) configure writes new build/version.xml 2) make compile copies content, including the tarball's src/version.xml to build/version.xml, and generates gtk-doc. 3) make install notices build/version.xml is older than configure.status, so regenerates gtk-doc. gtk-doc generation is a slow process at the best of times, so doing it twice isn't good. Signed-off-by: Ross Burton --- meta/recipes-gnome/gtk-doc/files/no-clobber.patch | 27 +++++++++++++++++++++++ meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-gnome/gtk-doc/files/no-clobber.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch new file mode 100644 index 00000000000..b0a5dcade21 --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch @@ -0,0 +1,27 @@ +In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir. + +However, if some of this content is regenerated at configure time this can happen: + +1) configure writes new build/version.xml +2) make compile copies content, including the tarball's src/version.xml + to build/version.xml, and generates gtk-doc. +3) make install notices build/version.xml is older than configure.status, + so regenerates gtk-doc. + +gtk-doc generation is a slow process at the best of times, so doing it twice isn't good. + +Solve this by changing cp --force to cp --no-clobber, so setup-build only copies +files which don't already exist. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/gtk-doc.make b/gtk-doc.make +index f87eaab..246f3c0 100644 +--- a/gtk-doc.make ++++ b/gtk-doc.make +@@ -113,3 +113,3 @@ setup-build.stamp: + test -f $(abs_srcdir)/$$file && \ +- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ ++ cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb index b907bae1478..45528111c13 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb @@ -23,6 +23,7 @@ SRC_URI[archive.sha256sum] = "e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6 SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ + file://no-clobber.patch \ " SRC_URI_append_class-native = " file://pkg-config-native.patch"