Re: [PATCH] doc: Fix parallel build of roff files

diff --git a/50/cf328889383d322d8dedd7e5e3269405520033 b/50/cf328889383d322d8dedd7e5e3269405520033
new file mode 100644 (file)
index 0000000..b1bca34
--- /dev/null
+++ b/50/cf328889383d322d8dedd7e5e3269405520033
@@ -0,0 +1,107 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 95105431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 00:13:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id NItDBZ653P6o for <notmuch@notmuchmail.org>;\r
+       Fri, 18 Apr 2014 00:13:31 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7650F431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 00:13:31 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 13A4610008F;\r
+       Fri, 18 Apr 2014 10:13:24 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] doc: Fix parallel build of roff files\r
+In-Reply-To: <1397766897-14475-1-git-send-email-amdragon@mit.edu>\r
+References: <1397766897-14475-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.17+201~g56da2d6 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 18 Apr 2014 10:13:23 +0300\r
+Message-ID: <m2wqen3yb0.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 18 Apr 2014 07:13:39 -0000\r
+\r
+On Thu, Apr 17 2014, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> The roff build rule builds all of the roff files in a single command.\r
+> Previously, this was expressed as a multi-target rule, but since this\r
+> is equivalent to specifying a copy of the rule for each target, make\r
+> -jN could start up to N parallel instances of this command.  Fix this\r
+> by bottlenecking this rule through a single stamp file.\r
+>\r
+> This also removes the unused man.stamp from CLEAN.\r
+> ---\r
+>  doc/Makefile.local | 11 +++++++++--\r
+>  1 file changed, 9 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/doc/Makefile.local b/doc/Makefile.local\r
+> index 0980c71..5cf140d 100644\r
+> --- a/doc/Makefile.local\r
+> +++ b/doc/Makefile.local\r
+> @@ -35,7 +35,13 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES})\r
+>  \r
+>  # Use the man page converter that is available. We should never depend\r
+>  # on MAN_ROFF_FILES if a converter is not available.\r
+> -${MAN_ROFF_FILES}: ${MAN_RST_FILES}\r
+> +${MAN_ROFF_FILES}: $(DOCBUILDDIR)/.roff.stamp\r
+> +\r
+> +# By using $(DOCBUILDDIR)/roff.stamp instead of ${MAN_ROFF_FILES}, we\r
+> +# convey to make that a single invocation of this receipe builds all\r
+\r
+LGTM. This 'receipe' could be amended to recipe(?:)\r
+\r
+> +# of the roff files.  This prevents parallel make from starting an\r
+> +# instance of this recipe for each roff file.\r
+> +$(DOCBUILDDIR)/.roff.stamp: ${MAN_RST_FILES}\r
+>  ifeq ($(HAVE_SPHINX),1)\r
+>      $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man\r
+>      for section in 1 5 7; do \\r
+> @@ -48,6 +54,7 @@ else\r
+>      @echo "Fatal: build dependency fail."\r
+>      @false\r
+>  endif\r
+> +    touch ${MAN_ROFF_FILES} $@\r
+>  \r
+>  # Do not try to build or install man pages if a man page converter is\r
+>  # not available.\r
+> @@ -70,5 +77,5 @@ endif\r
+>  $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py\r
+>      $(mkdocdeps) $(srcdir)/doc $(DOCBUILDDIR) $@\r
+>  \r
+> -CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(dir)/man.stamp\r
+> +CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(DOCBUILDDIR)/.roff.stamp\r
+>  CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES)\r
+> -- \r
+> 1.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r