Hi, Steve Could you help to cherry-pick this patch to scarthgap? Thanks
Regards Changqing On 5/28/24 17:11, Changqing Li wrote:
From: Changqing Li<changqing...@windriver.com> 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. Signed-off-by: Changqing Li<changqing...@windriver.com> --- ...1-intl-Fix-build-failure-with-make-j.patch | 35 +++++++++++++++++++ meta/recipes-core/gettext/gettext_0.22.5.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch 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 @@ +From 97a6a63ad61949663283f5fad68c9d5fb9be1f15 Mon Sep 17 00:00:00 2001 +From: Bruno Haible<br...@clisp.org> +Date: Tue, 12 Sep 2023 11:33:41 +0200 +Subject: [PATCH] intl: Fix build failure with "make -j". + +Reported by Christian Weisgerber<na...@mips.inka.de> at +<https://lists.gnu.org/archive/html/bug-gettext/2023-09/msg00005.html>. + +* gettext-runtime/intl/Makefile.am (langprefs.lo, log.lo): Depend on gettextP.h +and its subordinate includes. + +Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15] +Signed-off-by: Changqing Li<changqing...@windriver.com> +--- + gettext-runtime/intl/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am +index da7abb758..9e56978bc 100644 +--- a/gettext-runtime/intl/Makefile.am ++++ b/gettext-runtime/intl/Makefile.am +@@ -387,8 +387,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo + ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h + plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS) + plural-exp.lo: ../config.h $(srcdir)/plural-exp.h +-langprefs.lo: ../config.h +-log.lo: ../config.h ++langprefs.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h ++log.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h + printf.lo: ../config.h + setlocale.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h + version.lo: ../config.h libgnuintl.h +-- +2.25.1 + 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 += " \ file://serial-tests-config.patch \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ +file://0001-intl-Fix-build-failure-with-make-j.patch \ "inherit autotools texinfo pkgconfig ptest
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#202136): https://lists.openembedded.org/g/openembedded-core/message/202136 Mute This Topic: https://lists.openembedded.org/mt/107265115/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
