From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MMhIClH4wGEILwEAgWs5BA (envelope-from ) for ; Mon, 20 Dec 2021 22:40:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0HjeBVH4wGEGXAAAB5/wlQ (envelope-from ) for ; Mon, 20 Dec 2021 21:40:33 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 637712F6C9 for ; Mon, 20 Dec 2021 22:40:32 +0100 (CET) Received: from localhost ([::1]:51848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzQOV-0006sk-Fb for larch@yhetil.org; Mon, 20 Dec 2021 16:40:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzQNa-0006sN-VU for emacs-orgmode@gnu.org; Mon, 20 Dec 2021 16:39:34 -0500 Received: from [2a00:1450:4864:20::32c] (port=35414 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzQNX-0002gF-5Y for emacs-orgmode@gnu.org; Mon, 20 Dec 2021 16:39:34 -0500 Received: by mail-wm1-x32c.google.com with SMTP id bg2-20020a05600c3c8200b0034565c2be15so333467wmb.0 for ; Mon, 20 Dec 2021 13:39:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=OLsSzeqZf/g4s6hXk1SAR0+7YMDOCgWLmnJzMup4mTk=; b=i9hABG4F045JQb4z5RcK19jp7+sFQjtpaZfLAm6mvqXTnJZsQu1BhIIQrVCKrNwK+3 Xeb9J2ATEg0Dyw4GjB0Q4sZYVJiAiKZX84v33DE/a3mn2J6lJwUGA/QsXil1MBnA3bTa VdfsNERiZdjPfTmoO8PS0B9Y5r0SPNqc8A7LgKTZkUxVSq/5IJtdHbt7Wij3UbyBZbyS x/SfwsAaBLZtGnKFyUYTG1rlfvZ6Qv3tux4UmmNdIi6DduOLsPYOsprKLcuU8WpoGTe/ YoXO7f/vDtdwV3B8U9FHCPjKjnY8fPcdtXHs6MOCpPueXChZnv0WoeExS7IkQNsXMTdj MBjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=OLsSzeqZf/g4s6hXk1SAR0+7YMDOCgWLmnJzMup4mTk=; b=FwsUuMzsU/FX3D+GV20TPdVVDQt1F/GTzgTL23tGMmKoYU8pB2Fnt5bjbahQKWaaRx 8HLxoNfCVaueLmtyoigTmffHb7prDRyYC4M7aKRyEPYdy2AJEA9pd47PNpua/6nVPK+P SwzsBEQkqAzMzMIp9F4GAgGFhnAK3HpcmoD9nNOxyCKjOFtR3KieYJxSS2D5JeUSOry3 V+7Gn43TSittTQhe1yKMOFpmgP5A7+0rMhUum3LlT0QKwJogXWlv2spn3lXXa7p6qOMn XfruG/HckRbEtOoQV1yKiMC5zPWW/8OEl2pIal3qX5WIEmrgeyAGRY8ca3yPspFZJ5/r N75Q== X-Gm-Message-State: AOAM531qQy4J/IobfY8iUtUd4UOx65QfuDiZEULHzRHAlbQ0C74eIwax 6zCINiajPW5yuXtfcGcCtLw= X-Google-Smtp-Source: ABdhPJzGHt3G3YGaWoFlopG4N5pEwgYzLjPLCyjHWASexvenYBXUhxbPYu2PHmdgBzu+XhIVnRj6+g== X-Received: by 2002:a05:600c:5115:: with SMTP id o21mr797511wms.81.1640036369255; Mon, 20 Dec 2021 13:39:29 -0800 (PST) Received: from aspire-5942 (p200300d8671f00001d97632a8c3f8846.dip0.t-ipconnect.de. [2003:d8:671f:0:1d97:632a:8c3f:8846]) by smtp.gmail.com with ESMTPSA id r5sm12122064wrj.4.2021.12.20.13.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Dec 2021 13:39:28 -0800 (PST) From: Marco Wahl To: Ulrich =?utf-8?Q?M=C3=BCller?= Subject: Re: [PATCH] Fix parallel build failure for Texinfo manual References: Date: Mon, 20 Dec 2021 22:39:06 +0100 In-Reply-To: ("Ulrich =?utf-8?Q?M=C3=BCller=22's?= message of "Mon, 20 Dec 2021 17:44:53 +0100") Message-ID: <87r1a7rm6d.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=marcowahlsoft@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emacs-orgmode@gnu.org Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640036432; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=OLsSzeqZf/g4s6hXk1SAR0+7YMDOCgWLmnJzMup4mTk=; b=qRSY33BP/J0qV3jX9obWBN+mMs1sLhZ5IQCzNomuE2/jwAVvC4VjrFnaTOoikXhBz/BcBy +ujbK1wMIv5M4fcqKgRx4iOTvfOJs8/PVoDTZOLiZhcSqz1fxvgRpY79KUcdejRbZA7DAM droUeaQlJHCxnkeX5cUqntlUONz4by2mAmiX5Iri9duEkQT9zetMTIRflINeVTCXVHRw/y /K4aSg99ENiGIgSiOu9yCoON/UNv7L08Z+xXWWD6+6yYgSlxBk68y9HtMAn0ik/N5vh8RN OXc3V8SUSOnpFGEgqS3RiHoEOl39bMA/ovwg2SyG0L1zkzNxB9M7MiLsX6FeXg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640036432; a=rsa-sha256; cv=none; b=KsYiunz6gBWMS7TZQKb6VzAMP18RfuYtI3Dzpaz0g/Qs3O7hU1E1npyBf4DjPeZZh7+Xrd 8x6+dHBw3jm8ZjE6Uoz+ygGk3e2ArtOOvsDtTUCz4hB20SqJaGMx0gYJ1ibFGkixMIzkNs AcCvwREpB31hGHO4I0dSKPul+ohlLrtpzBls29MIJ23yQ+QY2ovO/X4FhNd40CezhU1/Wy G0tZPLpA4B2SkSaDVrndTN4rBvCPgPfpCxzYqS4uCNUiNZxaFMSs3XS3cRIfjcL2MEBKMI YMb/Rtf8iPekgwkAPWkqcqEGRRENq4TpVR5BUYinA6KIOfsFaoR/oc99f7ukEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=i9hABG4F; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -9.22 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=i9hABG4F; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 637712F6C9 X-Spam-Score: -9.22 X-Migadu-Scanner: scn0.migadu.com X-TUID: URo1suThGsoV --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ulrich M=C3=BCller writes: > * doc/Makefile (org.texi, orgguide.texi): Fix parallel build failure. > --- > > Forwarding Gentoo Linux bug #829055 . > When doing a parallel build (make -j16), a failure was observed when > building the Texinfo documentation: > > make -C doc info > make[1]: Entering directory '/var/tmp/portage/app-emacs/org-mode-9.5/work= /org-mode-release_9.5/doc' > emacs -Q -batch --eval '(setq vc-handled-backends nil org-startup-folded= nil)' \ > --eval '(add-to-list `load-path "../lisp")' \ > --eval '(load "../mk/org-fixup.el")' \ > --eval '(org-make-manuals)' > emacs -Q -batch --eval '(setq vc-handled-backends nil org-startup-folded= nil)' \ > --eval '(add-to-list `load-path "../lisp")' \ > --eval '(load "../mk/org-fixup.el")' \ > --eval '(org-make-manuals)' > Loading /var/tmp/portage/app-emacs/org-mode-9.5/work/org-mode-release_9.5= /mk/org-fixup.el (source)... > Loading /var/tmp/portage/app-emacs/org-mode-9.5/work/org-mode-release_9.5= /mk/org-fixup.el (source)... > ...lease_9.5/doc/org.texi locked by portage@local... (pid 55): (s, q, p, = ?)?=20 > Cannot resolve lock conflict in batch mode > make[1]: *** [Makefile:31: orgguide.texi] Error 255 > make[1]: *** Waiting for unfinished jobs.... > make[1]: Leaving directory '/var/tmp/portage/app-emacs/org-mode-9.5/work/= org-mode-release_9.5/doc' > make: *** [mk/targets.mk:127: info] Error 2 > > Fix by making org.texi a prerequisite of orgguide.texi, with an empty > recipe. > > doc/Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/doc/Makefile b/doc/Makefile > index 96fda1445..7f996deae 100644 > --- a/doc/Makefile > +++ b/doc/Makefile > @@ -27,12 +27,14 @@ guide:: orgguide.texi org-version.inc > ../mk/guidesplit.pl $@/* > endif >=20=20 > -org.texi orgguide.texi: org-manual.org org-guide.org > +org.texi: org-manual.org org-guide.org > $(BATCH) \ > --eval '(add-to-list '"'"'load-path "../lisp")' \ > --eval '(load "../mk/org-fixup.el")' \ > --eval '(org-make-manuals)' >=20=20 > +orgguide.texi: org.texi > + > org-version.inc: org.texi > @echo "org-version: $(ORGVERSION) ($(GITVERSION))" > @echo "@c automatically generated, do not edit" > org-version.inc Thanks for the report and the suggestion. Possibly a split of function org-make-manuals in org-make-manual and org-make-guide and further create two single targets instead of the current double target is more clear. See the patch. WDYT? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-Fix-parallel-make-of-docs.patch Content-Transfer-Encoding: quoted-printable >From cc89632186d63b2078baf446e44ed1425974be5e Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Mon, 20 Dec 2021 22:27:50 +0100 Subject: [PATCH] Fix parallel make of docs MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * doc/Makefile: Split multiple target "org.texi orgguide.texi". * mk/org-fixup.el (org-make-manual, org-make-guide): New functions. (org-make-manuals): Removed. Reported by Ulrich M=C3=BCller. https://list.orgmode.org/uee67gr96@gentoo.= org/ --- doc/Makefile | 10 ++++++++-- mk/org-fixup.el | 15 ++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 7fb96e65d..5b8639330 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -27,11 +27,17 @@ guide:: orgguide.texi org-version.inc ../mk/guidesplit.pl $@/* endif =20 -org.texi orgguide.texi: org-manual.org org-guide.org +org.texi: org-manual.org org-guide.org $(BATCH) \ --eval '(add-to-list `load-path "../lisp")' \ --eval '(load "../mk/org-fixup.el")' \ - --eval '(org-make-manuals)' + --eval '(org-make-manual)' + +orgguide.texi: org-manual.org org-guide.org + $(BATCH) \ + --eval '(add-to-list `load-path "../lisp")' \ + --eval '(load "../mk/org-fixup.el")' \ + --eval '(org-make-guide)' =20 org-version.inc: org.texi @echo "org-version: $(ORGVERSION) ($(GITVERSION))" diff --git a/mk/org-fixup.el b/mk/org-fixup.el index c0eef23cb..e910f0b52 100644 --- a/mk/org-fixup.el +++ b/mk/org-fixup.el @@ -27,12 +27,17 @@ (require 'autoload) (require 'org-compat "org-compat.el") =20 -(defun org-make-manuals () - "Generate the Texinfo files out of Org manuals." +(defun org-make-manual () + "Generate the Texinfo file out of the Org manual." (require 'ox-texinfo) - (dolist (manual '("../doc/org-manual.org" "../doc/org-guide.org")) - (find-file manual) - (org-texinfo-export-to-texinfo))) + (find-file "../doc/org-manual.org") + (org-texinfo-export-to-texinfo)) + +(defun org-make-guide () + "Generate the Texinfo file out of the Org guide." + (require 'ox-texinfo) + (find-file "../doc/org-guide.org") + (org-texinfo-export-to-texinfo)) =20 (defun org-make-org-version (org-release org-git-version) "Make the file org-version.el in the current directory. --=20 2.25.1 --=-=-=--