diff options
author | Changqing Li <changqing.li@windriver.com> | 2024-05-28 17:11:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-30 09:04:14 +0100 |
commit | 99ff46cc9bb12619af55c892452cee3b90a545f0 (patch) | |
tree | fbbf1947176cb0ba089b417b780b3ea0c334101a /meta | |
parent | e034d3ff561688625b54f3ba836ad251b23009c3 (diff) | |
download | poky-99ff46cc9bb12619af55c892452cee3b90a545f0.tar.gz |
gettext: fix a parallel build issue
Occasionally, gettext will build failed with error:
In file included from ../../../gettext-0.22.5/gettext-runtime/intl/gettextP.h:71,
from ../../../gettext-0.22.5/gettext-runtime/intl/log.c:24:
./libgnuintl.h:98:1: error: unterminated comment
98 | /* The user can define _INTL_RE
| ^
./libgnuintl.h:17: error: unterminated #ifndef
17 | #ifndef _LIBINTL_H
In file included from ../../../gettext-0.22.5/gettext-runtime/intl/gettextP.h:71,
from ../../../gettext-0.22.5/gettext-runtime/intl/langprefs.c:25:
./libgnuintl.h:98:1: error: unterminated comment
98 | /* The user can define _INTL_RE
| ^
./libgnuintl.h:17: error: unterminated #ifndef
17 | #ifndef _LIBINTL_H
It is a parallel build issue caused by missing dependencies, backport
patch to fix it.
(From OE-Core rev: e18fc96f9d4c0a0525c21371d3f36e8dfe008b35)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch | 35 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.22.5.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch b/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch new file mode 100644 index 0000000000..144259dd3f --- /dev/null +++ b/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 97a6a63ad61949663283f5fad68c9d5fb9be1f15 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruno Haible <bruno@clisp.org> | ||
3 | Date: Tue, 12 Sep 2023 11:33:41 +0200 | ||
4 | Subject: [PATCH] intl: Fix build failure with "make -j". | ||
5 | |||
6 | Reported by Christian Weisgerber <naddy@mips.inka.de> at | ||
7 | <https://lists.gnu.org/archive/html/bug-gettext/2023-09/msg00005.html>. | ||
8 | |||
9 | * gettext-runtime/intl/Makefile.am (langprefs.lo, log.lo): Depend on gettextP.h | ||
10 | and its subordinate includes. | ||
11 | |||
12 | Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15] | ||
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
14 | --- | ||
15 | gettext-runtime/intl/Makefile.am | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am | ||
19 | index da7abb758..9e56978bc 100644 | ||
20 | --- a/gettext-runtime/intl/Makefile.am | ||
21 | +++ b/gettext-runtime/intl/Makefile.am | ||
22 | @@ -387,8 +387,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo | ||
23 | ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h | ||
24 | plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS) | ||
25 | plural-exp.lo: ../config.h $(srcdir)/plural-exp.h | ||
26 | -langprefs.lo: ../config.h | ||
27 | -log.lo: ../config.h | ||
28 | +langprefs.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h | ||
29 | +log.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h | ||
30 | printf.lo: ../config.h | ||
31 | setlocale.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h | ||
32 | version.lo: ../config.h libgnuintl.h | ||
33 | -- | ||
34 | 2.25.1 | ||
35 | |||
diff --git a/meta/recipes-core/gettext/gettext_0.22.5.bb b/meta/recipes-core/gettext/gettext_0.22.5.bb index 1a66d37916..7eeb1a86fd 100644 --- a/meta/recipes-core/gettext/gettext_0.22.5.bb +++ b/meta/recipes-core/gettext/gettext_0.22.5.bb | |||
@@ -28,6 +28,7 @@ SRC_URI += " \ | |||
28 | file://serial-tests-config.patch \ | 28 | file://serial-tests-config.patch \ |
29 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ | 29 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ |
30 | file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ | 30 | file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ |
31 | file://0001-intl-Fix-build-failure-with-make-j.patch \ | ||
31 | " | 32 | " |
32 | 33 | ||
33 | inherit autotools texinfo pkgconfig ptest | 34 | inherit autotools texinfo pkgconfig ptest |