| Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 1 | From c75965053124149381ada3c394da74be078076cf Mon Sep 17 00:00:00 2001 |
| 2 | From: "G. Branden Robinson" <g.branden.robinson@gmail.com> |
| 3 | Date: Sat, 16 Sep 2023 16:28:00 -0500 |
| 4 | Subject: [PATCH] [build]: Fix Savannah #64681 (webpage.ps deps). |
| 5 | |
| 6 | * doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and parallelize |
| 7 | target dependencies. Resolve race by requiring "grn" and "soelim" to |
| 8 | be built first. Also add dependency on `$(TMAC_PACKAGE_MS)`. |
| 9 | |
| 10 | Fixes <https://savannah.gnu.org/bugs/?64681>. Thanks to Alexander |
| 11 | Kanavin for the report. |
| 12 | |
| 13 | ANNOUNCE: Acknowledge Alexander. |
| 14 | |
| 15 | Upstream-Status: Backport |
| 16 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 17 | --- |
| 18 | doc/doc.am | 12 ++++++++---- |
| 19 | 1 file changed, 8 insertions(+), 4 deletions(-) |
| 20 | |
| 21 | diff --git a/doc/doc.am b/doc/doc.am |
| 22 | index cddc51907..d3c9ab6b7 100644 |
| 23 | --- a/doc/doc.am |
| 24 | +++ b/doc/doc.am |
| 25 | @@ -346,6 +346,9 @@ doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl |
| 26 | $(GROFF_V)$(MKDIR_P) `dirname $@` \ |
| 27 | && $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@ |
| 28 | |
| 29 | +# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and |
| 30 | +# soelim even though the document doesn't require them. |
| 31 | +doc/webpage.ps: grn soelim |
| 32 | doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl |
| 33 | doc/webpage.ps: $(doc_srcdir)/webpage.ms |
| 34 | $(GROFF_V)$(MKDIR_P) `dirname $@` \ |
| 35 | @@ -365,11 +368,12 @@ doc/pic.html: $(doc_srcdir)/pic.ms |
| 36 | && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \ |
| 37 | $(doc_srcdir)/pic.ms > pic.html |
| 38 | |
| 39 | -doc/webpage.html: tbl |
| 40 | -doc/webpage.html: tmac/www.tmac |
| 41 | -doc/webpage.html: $(DOC_GNU_EPS) |
| 42 | +# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and |
| 43 | +# soelim even though the document doesn't require them. |
| 44 | +doc/webpage.html: grn soelim |
| 45 | +doc/webpage.html: $(DOC_GNU_EPS) tmac/www.tmac tbl |
| 46 | doc/webpage.html: $(doc_srcdir)/groff.css |
| 47 | -doc/webpage.html: $(doc_srcdir)/webpage.ms |
| 48 | +doc/webpage.html: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS) |
| 49 | $(GROFF_V)$(MKDIR_P) $(doc_builddir) \ |
| 50 | && cd $(doc_builddir) \ |
| 51 | && $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \ |