From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050:0:465::202]) by sourceware.org (Postfix) with ESMTPS id D6FAB3858028; Tue, 26 Sep 2023 01:00:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6FAB3858028 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (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-202.mailbox.org (Postfix) with ESMTPS id 4RvhHj60rvz9spq; Tue, 26 Sep 2023 03:00:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1695690033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DCzv66KKN8jJKYYMYhyKc5pJE3srv6qowJDetBf2tro=; b=mTRdrC8ab+ZSGue7m5V6rJ7s9W0WWHntwgY+c0kp27+LDJir47npTJ1r511n4tvrc+IJjD TDrKD1u+BSeSWBOgBl74LFcobf8MKmFYYJO5dBDVLqH7e0bZ4Yz1vdqwXE0rT/cqpkdT2H EmYGNT+Q0pxNkBf95lYYcgiN3gq0hdXMQHE+lBY0r0RQ5WnN7NRaO514XljnAXRu/0HlZv 5JgVN1MVNAF3OWuaCkvXMJR0u15bNpTozOzp5gam2enDWSIcTpKrQGgzUzZ3C/l40atVwM ELQZRslBL2DQOyRxhu0Ci/h9l9XcLxzUDQrQOREv75tyS+4ukS/Jx+crhp16Gw== From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= To: gdb-patches@sourceware.org, binutils@sourceware.org Cc: Bruno Haible , Iain Sandoe , =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Subject: [PATCH v2 2/2] *: suppress xgettext 0.22 charset name error Date: Tue, 26 Sep 2023 02:17:34 +0200 Message-ID: <20230926004300.1716711-4-arsen@aarsen.me> In-Reply-To: <20230926004300.1716711-2-arsen@aarsen.me> References: <20230926004300.1716711-2-arsen@aarsen.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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,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 List-Id: 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. opcodes/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 +++-- gold/po/Make-in | 5 +++-- gprof/po/Make-in | 5 +++-- ld/po/Make-in | 8 +++++--- opcodes/po/Make-in | 5 +++-- 7 files changed, 25 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/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/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 -- 2.42.0