From patchwork Mon Sep 25 15:13:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arsen_Arsenovi=C4=87?= X-Patchwork-Id: 76650 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 34A44385B81D for ; Mon, 25 Sep 2023 15:34:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 34A44385B81D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695656081; bh=R6KfFBcaJFjYbpogmeftjT501s7d5dHtk7mwYV4i5N4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=fz516AW/SZoOAKY8RbsOYt9tUbwKZYucSQCvtlxFz6PeCXiroIIQTaclknMJDmr6D 5WFv7n4soeJ5zH75RBdL/j9VBjkoJdQl+4ZSbV3bb+jok6z0alWbnjdOjjWyH27/6H 3ecgLDCAOpiLhDgEpcMqvjmSMMhRkB0l3y392Ap0= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by sourceware.org (Postfix) with ESMTPS id B14D43857C40; Mon, 25 Sep 2023 15:33:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B14D43857C40 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4RvRht52ytz9sms; Mon, 25 Sep 2023 17:33:02 +0200 (CEST) To: gdb-patches@sourceware.org, binutils@sourceware.org Subject: [PATCH 2/2] *: suppress xgettext 0.22 charset name error Date: Mon, 25 Sep 2023 17:13:41 +0200 Message-ID: <20230925153247.908901-3-arsen@aarsen.me> In-Reply-To: <20230925153247.908901-1-arsen@aarsen.me> References: <20230925153247.908901-1-arsen@aarsen.me> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4RvRht52ytz9sms X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_INFOUSMEBIZ, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Gdb-patches?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= Cc: Iain Sandoe , Bruno Haible Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" bfd.po: warning: Charset "CHARSET" is not a portable encoding name. Message conversion to user's charset might not work. /usr/bin/xgettext: present charset "CHARSET" is not a portable encoding name As Bruno Haible suggested: > > Perhaps it'd be good to use -o to suppress this warning anyway > > Yes, regardless of gettext version, you profit of the .pot suffix handling by > replacing > > --default-domain=$(PACKAGE) > > with > > -o $(PACKAGE)-tmp.pot > > (twice) and > > < $(PACKAGE).po > $@-t > > with > > < $(PACKAGE)-tmp.pot > $@-t bfd/ChangeLog: * po/Make-in ($(srcdir)/$(PACKAGE).pot): Output to a .pot temporary file, to suppress xgettext checking charset names. binutils/ChangeLog: * po/Make-in ($(srcdir)/$(PACKAGE).pot): Output to a .pot temporary file to suppress xgettext checking charset names. gas/ChangeLog: * po/Make-in ($(srcdir)/$(PACKAGE).pot): Output to a .pot temporary file to suppress xgettext checking charset names. gold/ChangeLog: * po/Make-in ($(srcdir)/$(PACKAGE).pot): Output to a .pot temporary file to suppress xgettext checking charset names. gprof/ChangeLog: * po/Make-in ($(srcdir)/$(PACKAGE).pot): Output to a .pot temporary file to suppress xgettext checking charset names. ld/ChangeLog: * po/Make-in ($(srcdir)/$(PACKAGE).pot): Output to a .pot temporary file to suppress xgettext checking charset names. libctf/ChangeLog: * po/Make-in ($(srcdir)/$(PACKAGE).pot): Output to a .pot temporary file to suppress xgettext checking charset names. --- bfd/po/Make-in | 8 +++++--- binutils/po/Make-in | 5 +++-- gas/po/Make-in | 5 +++-- gdbsupport/Makefile.am | 1 + gold/po/Make-in | 5 +++-- gprof/po/Make-in | 5 +++-- ld/po/Make-in | 8 +++++--- libctf/Makefile.am | 2 ++ opcodes/po/Make-in | 5 +++-- 9 files changed, 28 insertions(+), 16 deletions(-) diff --git a/bfd/po/Make-in b/bfd/po/Make-in index 30bcd5576e9..af8f4fb5757 100644 --- a/bfd/po/Make-in +++ b/bfd/po/Make-in @@ -93,19 +93,21 @@ all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot all-no: $(srcdir)/$(PACKAGE).pot: $(SRC-POTFILES) $(BLD-POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot \ + --default-domain=$(PACKAGE) \ --directory=$(top_srcdir) \ --add-comments --keyword=_ --keyword=N_ \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/SRC-POTFILES.in - $(XGETTEXT) --default-domain=$(PACKAGE) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot \ + --default-domain=$(PACKAGE) \ --directory=.. \ --directory=. \ --add-comments --keyword=_ --keyword=N_ \ --join-existing \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/BLD-POTFILES.in - sed -e '/^#:/s,$(top_srcdir)/,,g' < $(PACKAGE).po > $@-t + sed -e '/^#:/s,$(top_srcdir)/,,g' < $(PACKAGE)-tmp.pot > $@-t mv -f $@-t $@ $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: diff --git a/binutils/po/Make-in b/binutils/po/Make-in index 167b04b7560..6ae60ac2bcd 100644 --- a/binutils/po/Make-in +++ b/binutils/po/Make-in @@ -87,12 +87,13 @@ all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot all-no: $(srcdir)/$(PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot --directory=$(top_srcdir) \ + --default-domain=$(PACKAGE) \ --add-comments --keyword=_ --keyword=N_ \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/POTFILES.in rm -f $(srcdir)/$(PACKAGE).pot - mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot + mv $(PACKAGE)-tmp.pot $(srcdir)/$(PACKAGE).pot $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot diff --git a/gas/po/Make-in b/gas/po/Make-in index 167b04b7560..6ae60ac2bcd 100644 --- a/gas/po/Make-in +++ b/gas/po/Make-in @@ -87,12 +87,13 @@ all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot all-no: $(srcdir)/$(PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot --directory=$(top_srcdir) \ + --default-domain=$(PACKAGE) \ --add-comments --keyword=_ --keyword=N_ \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/POTFILES.in rm -f $(srcdir)/$(PACKAGE).pot - mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot + mv $(PACKAGE)-tmp.pot $(srcdir)/$(PACKAGE).pot $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am index 00524e9a566..43aa670faf4 100644 --- a/gdbsupport/Makefile.am +++ b/gdbsupport/Makefile.am @@ -19,6 +19,7 @@ AUTOMAKE_OPTIONS = no-dist foreign ACLOCAL_AMFLAGS = -I . -I ../config +SUBDIRS = AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../gdb \ -I../gnulib/import -I$(srcdir)/../gnulib/import \ diff --git a/gold/po/Make-in b/gold/po/Make-in index e8e881ba3e3..9fea006bf50 100644 --- a/gold/po/Make-in +++ b/gold/po/Make-in @@ -87,12 +87,13 @@ all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot all-no: $(srcdir)/$(PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot --directory=$(top_srcdir) \ + --default-domain=$(PACKAGE) \ --add-comments -C --keyword=_ --keyword=N_ \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/POTFILES.in rm -f $(srcdir)/$(PACKAGE).pot - mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot + mv $(PACKAGE)-tmp.pot $(srcdir)/$(PACKAGE).pot $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot diff --git a/gprof/po/Make-in b/gprof/po/Make-in index ba6f3923308..4b5c174f1e0 100644 --- a/gprof/po/Make-in +++ b/gprof/po/Make-in @@ -87,12 +87,13 @@ all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot all-no: $(srcdir)/$(PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot --directory=$(top_srcdir) \ + --default-domain=$(PACKAGE) \ --add-comments --keyword=_ --keyword=N_ \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/POTFILES.in rm -f $(srcdir)/$(PACKAGE).pot - mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot + mv $(PACKAGE)-tmp.pot $(srcdir)/$(PACKAGE).pot $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot diff --git a/ld/po/Make-in b/ld/po/Make-in index 26e318570fb..c6a301def68 100644 --- a/ld/po/Make-in +++ b/ld/po/Make-in @@ -89,17 +89,19 @@ all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot all-no: $(srcdir)/$(PACKAGE).pot: $(SRC-POTFILES) $(BLD-POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot --directory=$(top_srcdir) \ + --default-domain=$(PACKAGE) \ --add-comments --keyword=_ --keyword=N_ \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/SRC-POTFILES.in - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=.. \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot --directory=.. \ + --default-domain=$(PACKAGE) \ --add-comments --keyword=_ --keyword=N_ \ --join-existing \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/BLD-POTFILES.in rm -f $(srcdir)/$(PACKAGE).pot - mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot + mv $(PACKAGE)-tmp.pot $(srcdir)/$(PACKAGE).pot $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot diff --git a/libctf/Makefile.am b/libctf/Makefile.am index b1dbc2f6ba4..8c9f623f58c 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -17,6 +17,8 @@ # . # +SUBDIRS = + ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd AUTOMAKE_OPTIONS = dejagnu foreign info-in-builddir no-texinfo.tex diff --git a/opcodes/po/Make-in b/opcodes/po/Make-in index 167b04b7560..6ae60ac2bcd 100644 --- a/opcodes/po/Make-in +++ b/opcodes/po/Make-in @@ -87,12 +87,13 @@ all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot all-no: $(srcdir)/$(PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + $(XGETTEXT) -o $(PACKAGE)-tmp.pot --directory=$(top_srcdir) \ + --default-domain=$(PACKAGE) \ --add-comments --keyword=_ --keyword=N_ \ --msgid-bugs-address=https://sourceware.org/bugzilla/ \ --files-from=$(srcdir)/POTFILES.in rm -f $(srcdir)/$(PACKAGE).pot - mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot + mv $(PACKAGE)-tmp.pot $(srcdir)/$(PACKAGE).pot $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot