From: "Arsen Arsenović" <arsen@aarsen.me>
To: gdb-patches@sourceware.org, binutils@sourceware.org
Cc: "Bruno Haible" <bruno@clisp.org>,
"Iain Sandoe" <iain@sandoe.co.uk>,
"Arsen Arsenović" <arsen@aarsen.me>
Subject: [PATCH 2/2] *: suppress xgettext 0.22 charset name error
Date: Mon, 25 Sep 2023 17:13:41 +0200 [thread overview]
Message-ID: <20230925153247.908901-3-arsen@aarsen.me> (raw)
In-Reply-To: <20230925153247.908901-1-arsen@aarsen.me>
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
next prev parent reply other threads:[~2023-09-25 15:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 15:13 [PATCH 0/2] Replace intl/ with out-of-tree GNU gettext Arsen Arsenović
2023-09-25 15:13 ` [PATCH 1/2] *: add modern gettext support Arsen Arsenović
2023-09-25 15:13 ` Arsen Arsenović [this message]
2023-09-25 15:46 ` [PATCH 2/2] *: suppress xgettext 0.22 charset name error Andreas Schwab
2023-09-25 15:55 ` Arsen Arsenović
2023-09-25 19:11 ` [PATCH 0/2] Replace intl/ with out-of-tree GNU gettext Kevin Buettner
2023-09-25 19:43 ` Arsen Arsenović
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230925153247.908901-3-arsen@aarsen.me \
--to=arsen@aarsen.me \
--cc=binutils@sourceware.org \
--cc=bruno@clisp.org \
--cc=gdb-patches@sourceware.org \
--cc=iain@sandoe.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).