mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

groff: add a patch to resolve build races

Browse Source 
(From OE-Core rev: 0dedd8982bda35ef638c44b7a3a236dbbaebd621)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-09-17 11:39:01 +02:00
committed by Richard Purdie
parent 1f1f56d349
commit d1f84db670
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch Normal file
View File

@@ -0,0 +1,51 @@
From c75965053124149381ada3c394da74be078076cf Mon Sep 17 00:00:00 2001
From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
Date: Sat, 16 Sep 2023 16:28:00 -0500
Subject: [PATCH] [build]: Fix Savannah #64681 (webpage.ps deps).
* doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and parallelize
target dependencies. Resolve race by requiring "grn" and "soelim" to
be built first. Also add dependency on `$(TMAC_PACKAGE_MS)`.
Fixes <https://savannah.gnu.org/bugs/?64681>. Thanks to Alexander
Kanavin for the report.
ANNOUNCE: Acknowledge Alexander.
Upstream-Status: Backport
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
doc/doc.am | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/doc/doc.am b/doc/doc.am
index cddc51907..d3c9ab6b7 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -346,6 +346,9 @@ doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl
$(GROFF_V)$(MKDIR_P) `dirname $@` \
&& $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@
+# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and
+# soelim even though the document doesn't require them.
+doc/webpage.ps: grn soelim
doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl
doc/webpage.ps: $(doc_srcdir)/webpage.ms
$(GROFF_V)$(MKDIR_P) `dirname $@` \
@@ -365,11 +368,12 @@ doc/pic.html: $(doc_srcdir)/pic.ms
&& $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \
$(doc_srcdir)/pic.ms > pic.html
-doc/webpage.html: tbl
-doc/webpage.html: tmac/www.tmac
-doc/webpage.html: $(DOC_GNU_EPS)
+# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and
+# soelim even though the document doesn't require them.
+doc/webpage.html: grn soelim
+doc/webpage.html: $(DOC_GNU_EPS) tmac/www.tmac tbl
doc/webpage.html: $(doc_srcdir)/groff.css
-doc/webpage.html: $(doc_srcdir)/webpage.ms
+doc/webpage.html: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS)
$(GROFF_V)$(MKDIR_P) $(doc_builddir) \
&& cd $(doc_builddir) \
&& $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \

1
meta/recipes-extended/groff/groff_1.23.0.bb
View File

@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
file://groff-not-search-fonts-on-build-host.patch \
file://0001-Make-manpages-mulitlib-identical.patch \
file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \
"
SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"