diff mbox series

[v2,2/2] *: suppress xgettext 0.22 charset name error

Message ID	20230926004300.1716711-4-arsen@aarsen.me
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6FAB3858028 To: gdb-patches@sourceware.org, binutils@sourceware.org Cc: Bruno Haible <bruno@clisp.org>, Iain Sandoe <iain@sandoe.co.uk>, =?utf-8?q?Arsen_Arsenovi=C4=87?= <arsen@aarsen.me> 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 Precedence: list From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Binutils?= <binutils@sourceware.org> Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= <arsen@aarsen.me> Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org Sender: "Binutils" <binutils-bounces+patchwork=sourceware.org@sourceware.org>
Series	Replace intl/ with out-of-tree GNU gettext \| [v2,0/2] Replace intl/ with out-of-tree GNU gettext [v2,1/2] : add modern gettext support [v2,2/2] : suppress xgettext 0.22 charset name error

Checks

Context	Check	Description
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64	success	Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm	success	Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-arm	success	Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64	success	Testing passed

Commit Message

Arsen Arsenović Sept. 26, 2023, 12:17 a.m. UTC

  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 <bruno@clisp.org> 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(-)

Comments

Nick Clifton Sept. 27, 2023, 3:21 p.m. UTC | #1

Hi Arsen,

> 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 <bruno@clisp.org> 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.

This part of the patch set is approved as well.

Cheers
   Nick

diff mbox series

Patch

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