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

Arsen Arsenović arsen@aarsen.me
Mon Sep 25 15:13:41 GMT 2023 

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.

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 @@
 # <http://www.gnu.org/licenses/>.
 #
 
+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
-- 
2.42.0

More information about the Binutils mailing list