diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-09-17 11:39:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-18 08:53:10 +0100 |
commit | d1f84db670bd130353ebc5fb8077cf9657fb4e44 (patch) | |
tree | e8c5ce3f48bf7c79a9b9b219fda15da84180e5d1 /meta/recipes-extended/groff | |
parent | 1f1f56d34941fd6f1f1a42385950315d288b2e8d (diff) | |
download | poky-d1f84db670bd130353ebc5fb8077cf9657fb4e44.tar.gz |
groff: add a patch to resolve build races
(From OE-Core rev: 0dedd8982bda35ef638c44b7a3a236dbbaebd621)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/groff')
-rw-r--r-- | meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch | 51 | ||||
-rw-r--r-- | meta/recipes-extended/groff/groff_1.23.0.bb | 1 |
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch new file mode 100644 index 0000000000..eae5dc9998 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch | |||
@@ -0,0 +1,51 @@ | |||
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 \ | ||
diff --git a/meta/recipes-extended/groff/groff_1.23.0.bb b/meta/recipes-extended/groff/groff_1.23.0.bb index 1dcd0bb605..370817c9f2 100644 --- a/meta/recipes-extended/groff/groff_1.23.0.bb +++ b/meta/recipes-extended/groff/groff_1.23.0.bb | |||
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
10 | SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ | 10 | SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ |
11 | file://groff-not-search-fonts-on-build-host.patch \ | 11 | file://groff-not-search-fonts-on-build-host.patch \ |
12 | file://0001-Make-manpages-mulitlib-identical.patch \ | 12 | file://0001-Make-manpages-mulitlib-identical.patch \ |
13 | file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" | 16 | SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" |