Skip to content

Commit 0ec6cd5

Browse files
Cyanoxygenchenx97
authored andcommitted
po: add patch to disable parallel execution
- `msgfilter' might fail while processing de.po to generate de_CH.po, if there are too many prarallel jobs. - We observed this behaviour on our AMD EPYC 7H12 buildbot, with -j129. - Cyan tested without this patch on an Alder Lake Intel i7 machine, even with `make -j` (as much as GNU Make can assign), no such failure occurred.
1 parent 5855f82 commit 0ec6cd5

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

bootstrap.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ bootstrap_post_import_hook () {
9090
0001-Support-POTFILES-shell \
9191
0002-Handle-gettext_printf-shell-function \
9292
0003-Make-msgfmt-output-in-little-endian \
93-
0004-Use-SHELL-rather-than-bin-sh; do
93+
0004-Use-SHELL-rather-than-bin-sh \
94+
0005-po-Makefile.in.in-disable-parallel-execution; do
9495
patch -d po -p3 \
9596
< "po/gettext-patches/$patchname.patch"
9697
done

conf/Makefile.extra-dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ EXTRA_DIST += po/gettext-patches/0001-Support-POTFILES-shell.patch
112112
EXTRA_DIST += po/gettext-patches/0002-Handle-gettext_printf-shell-function.patch
113113
EXTRA_DIST += po/gettext-patches/0003-Make-msgfmt-output-in-little-endian.patch
114114
EXTRA_DIST += po/gettext-patches/0004-Use-SHELL-rather-than-bin-sh.patch
115+
EXTRA_DIST += po/gettext-patches/0005-po-Makefile.in.in-disable-parallel-execution.patch
115116

116117
EXTRA_DIST += po/POTFILES-shell.in
117118
EXTRA_DIST += po/README
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 8e8976fa14c4fe5e88cf9998893565635500d5b3 Mon Sep 17 00:00:00 2001
2+
From: Cyan <[email protected]>
3+
Date: Fri, 12 Jan 2024 22:19:25 +0800
4+
Subject: [PATCH] po/Makefile.in.in: disable parallel execution
5+
6+
---
7+
gettext-runtime/po/Makefile.in.in | 4 ++++
8+
1 file changed, 4 insertions(+)
9+
10+
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
11+
index 6b25f0d91..eb6e9d943 100644
12+
--- a/gettext-runtime/po/Makefile.in.in
13+
+++ b/gettext-runtime/po/Makefile.in.in
14+
@@ -92,6 +92,10 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
15+
16+
all: all-@USE_NLS@
17+
18+
+# FIXME: msgfilter might fail at some time if there are too much parallel
19+
+# jobs. This is observed while building GNU GRUB with -j129.
20+
+
21+
+.NOTPARALLEL:
22+
23+
.SUFFIXES:
24+
.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
25+
--
26+
2.39.1
27+

0 commit comments

Comments
 (0)