diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-09-25 10:49:29 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-26 10:25:42 +0100 |
commit | 6a660d8b44031ae5d4996a1170de7d0327613f80 (patch) | |
tree | 0fe592912226082054ff37c6e0588efce468d1ca | |
parent | 53809d9b01410f5f2bc088bdf22e8a2343fdcc2f (diff) | |
download | poky-6a660d8b44031ae5d4996a1170de7d0327613f80.tar.gz |
groff: fix another build race via backport
(From OE-Core rev: f8f8f2f697c53b1cc19326249e15bf0d864f0a05)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/groff/groff_1.23.0.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch b/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch new file mode 100644 index 0000000000..3e81b86ac8 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From f21e9f13beb57a1e0666edf9693d7c83f2189897 Mon Sep 17 00:00:00 2001 | ||
2 | From: "G. Branden Robinson" <g.branden.robinson@gmail.com> | ||
3 | Date: Fri, 22 Sep 2023 01:27:57 -0500 | ||
4 | Subject: [PATCH] [build]: meintro_fr.ps depends on tbl. | ||
5 | |||
6 | * doc/doc.am (doc/meintro_fr.ps): Depend on tbl, resolving race in | ||
7 | sufficiently parallelized builds. Overlooked in commit 92349ae223, | ||
8 | 2022-05-30. | ||
9 | |||
10 | Fixes <https://savannah.gnu.org/bugs/?64695>. Thanks to Alexander | ||
11 | Kanavin for the report. | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
15 | --- | ||
16 | doc/doc.am | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/doc/doc.am b/doc/doc.am | ||
20 | index d3c9ab6b7..0f95c7774 100644 | ||
21 | --- a/doc/doc.am | ||
22 | +++ b/doc/doc.am | ||
23 | @@ -334,7 +334,7 @@ SUFFIXES += .me.in .me | ||
24 | |||
25 | # Use '-K utf8', not '-k', in case 'configure' didn't find uchardet. | ||
26 | # The French translation uses tbl; its English counterpart does not. | ||
27 | -doc/meintro_fr.ps: doc/meintro_fr.me preconv | ||
28 | +doc/meintro_fr.ps: doc/meintro_fr.me preconv tbl | ||
29 | $(GROFF_V)$(MKDIR_P) `dirname $@` \ | ||
30 | && $(DOC_GROFF) -K utf8 -t -Tps -me -mfr $< >$@ | ||
31 | |||
diff --git a/meta/recipes-extended/groff/groff_1.23.0.bb b/meta/recipes-extended/groff/groff_1.23.0.bb index 370817c9f2..0fc4f831d8 100644 --- a/meta/recipes-extended/groff/groff_1.23.0.bb +++ b/meta/recipes-extended/groff/groff_1.23.0.bb | |||
@@ -11,6 +11,7 @@ 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 | file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ |
14 | file://0001-build-meintro_fr.ps-depends-on-tbl.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" | 17 | SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" |