From patchwork Tue Sep 26 00:17:34 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: 144663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1592286vqu; Mon, 25 Sep 2023 18:00:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCKfb2QYGMUmlbjXZqdmWte9eD/CAN5tzL0wiBT1ROrJZsYu9uIPq4d9ThtJhfFL1cbKfX X-Received: by 2002:aa7:ca46:0:b0:522:20a0:7eb8 with SMTP id j6-20020aa7ca46000000b0052220a07eb8mr7376033edt.33.1695690058761; Mon, 25 Sep 2023 18:00:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695690058; cv=none; d=google.com; s=arc-20160816; b=UNku4j2ottPimpkJT+jFPDDwrR0HJHIKdE8gmi3vZlZBFyBJOH0WdGXglHJPK/6cZl qRbm/mUSKzre/MEmq1Ax2plYJdY70dRM+TVi/vv/zj6ZLvEAILv9q+qXbmC92gZrxQ7W 9sJ9oDVHbstPDyFWagPGdEtbzifZe0Oa7jR5UQPHsQiLddye77wfqxNWNmMLh7MbE/Mt r8xj+mhLNWf48ozDgLy++T3LFqBSvLvp9e/Pr89753Ke3UNSUOl6vA6tKkcUflBRoFEw Zk5nYFL4PzXzYhBYE4H2Dk2T7a2oj0zdZVlYtQyiKfk/iGtidBX+MGJUZgcWs9VmfpWl zD4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=DCzv66KKN8jJKYYMYhyKc5pJE3srv6qowJDetBf2tro=; fh=Dolx+bSIgcNfe/9raUi/hBaZIULLbzXXihwgj9UsDGg=; b=rKT5Abb7nnC9/czoLvsOvdmeup+TlYUSqdOLSu/OVDFFJJh0Vl/9g3rfxyacmjUZ9b 4mJ6vAru6qp+AAEQsKVvqtHD1m+FLOIrqo9dOawheWdA1AJ6lLUK8FM2ltVbb951FoTN xe43iSwDfEglyPw1Gfoi/hbaR58XOT8Sm4cui3chX8SAynG99ro84ZPCsfRK0cmkU08f noHlVbSlhqyFu47FVkEkVMj49JpwCAeTAFpKa9BWz5kp+Q3C9m10C/LUNHra34ycCbgx blsXsakGqoanivW8FqsJxRoIoAP6xx+jnpJtNNfYG0iO3MCX9maMUs7ZZ2byzU0YIqOm NeLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=tiPXp84V; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id f15-20020a05640214cf00b00534066714d1si3679976edx.193.2023.09.25.18.00.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 18:00:58 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=tiPXp84V; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 90F153856964 for ; Tue, 26 Sep 2023 01:00:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90F153856964 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695690056; bh=DCzv66KKN8jJKYYMYhyKc5pJE3srv6qowJDetBf2tro=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=tiPXp84V4Wofnx1Om3LjXyYX+ymWvnY/MsHlsTxGu0KH/fNf0g5Pc1J/RjdHYcsWs IL6uSqmUIUW0dICBS8fMKmRwFLddxrU5buSq/KY9b05uarWM37houThiPVwsH1/EO3 n6GbFPZlyvRZzupC9t2KOWEjs4xKFUonBng/4Mu0= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org 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 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) To: gdb-patches@sourceware.org, binutils@sourceware.org Cc: Bruno Haible , Iain Sandoe , =?utf-8?q?Arsen_Arsenovi=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 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Binutils?= From: =?utf-8?q?Arsen_Arsenovi=C4=87?= Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778059898895663397 X-GMAIL-MSGID: 1778059898895663397 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