From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 00:21:02 2023 Received: (at submit) by debbugs.gnu.org; 13 Jan 2023 05:21:02 +0000 Received: from localhost ([127.0.0.1]:49133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGCUv-0005gq-Ap for submit@debbugs.gnu.org; Fri, 13 Jan 2023 00:21:02 -0500 Received: from lists.gnu.org ([209.51.188.17]:35312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGCUt-0005gi-Fo for submit@debbugs.gnu.org; Fri, 13 Jan 2023 00:21:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGCUt-0006tR-66 for automake-patches@gnu.org; Fri, 13 Jan 2023 00:20:59 -0500 Received: from woodpecker.gentoo.org ([140.211.166.183] helo=smtp.gentoo.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pGCUr-0003h9-4B for automake-patches@gnu.org; Fri, 13 Jan 2023 00:20:58 -0500 Received: by smtp.gentoo.org (Postfix, from userid 559) id 37D4D340AEC; Fri, 13 Jan 2023 05:20:55 +0000 (UTC) From: Mike Frysinger To: automake-patches@gnu.org Subject: [PATCH] tests: rework gettext to only check 'external' behavior Date: Fri, 13 Jan 2023 00:20:52 -0500 Message-Id: <20230113052052.19271-1-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=140.211.166.183; envelope-from=vapier@gentoo.org; helo=smtp.gentoo.org X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) The gettext project deprecated non-external use back in 2010 with the 0.18 release, and made it fatal with the 0.20 release in 2019. With that version, calling AM_GNU_GETTEXT() fails, which means all Automake tests are now skipped. The t/gettext-macros.sh helper probes gettext as such: >+ autopoint --force > autopoint: *** AM_GNU_GETTEXT without 'external' argument is no longer supported in version 0.21.1 > autopoint: *** Stop. > ... >+ aclocal-1.16 -Werror -Wno-syntax -I m4 --install > aclocal-1.16: warnings are treated as errors > configure.ac:4: warning: macro 'AM_GNU_GETTEXT' not found in library > configure.ac:5: warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library >+ echo skip_all_ "couldn't find or get gettext macros" Since t/gettext-macros.sh generates a helper that all other gettext tests use to see if gettext is available, all they get skipped. Rework our existing tests to only check the 'external' gettext mode. This should work with older versions, and we don't really need to keep track of old non-external mode since it's been deprecated for so long. * t/gettext-basics.sh: Use external gettext mode, and adjust tests. * t/gettext-config-rpath.sh: Likewise. * t/gettext-macros.sh: Likewise. * t/gettext-pr381.sh: Likewise. * t/subdir-cond-gettext.sh: Likewise. --- t/gettext-basics.sh | 19 ++++++------------- t/gettext-config-rpath.sh | 6 +++--- t/gettext-macros.sh | 2 +- t/gettext-pr381.sh | 2 +- t/subdir-cond-gettext.sh | 6 +++--- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/t/gettext-basics.sh b/t/gettext-basics.sh index 93fe782f4027..6d733928c68f 100644 --- a/t/gettext-basics.sh +++ b/t/gettext-basics.sh @@ -20,7 +20,7 @@ required='gettext' . test-init.sh cat >> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) AC_OUTPUT END @@ -31,28 +31,21 @@ mkdir po intl $ACLOCAL $AUTOCONF -# po/ and intl/ are required. +# po/ is required. intl/ should not be used. AUTOMAKE_fails --add-missing grep 'AM_GNU_GETTEXT.*SUBDIRS' stderr echo 'SUBDIRS = po' >Makefile.am -AUTOMAKE_fails --add-missing -grep 'AM_GNU_GETTEXT.*intl' stderr +# Should not fail. +$AUTOMAKE --add-missing echo 'SUBDIRS = intl' >Makefile.am AUTOMAKE_fails --add-missing grep 'AM_GNU_GETTEXT.*po' stderr -# Ok. - echo 'SUBDIRS = po intl' >Makefile.am -$AUTOMAKE --add-missing - -# Make sure distcheck runs './configure --with-included-gettext'. -./configure -echo distdir: > po/Makefile -echo distdir: > intl/Makefile -$MAKE -n distcheck | grep '.*--with-included-gettext' +AUTOMAKE_fails --add-missing +grep 'intl.*SUBDIRS.*AM_GNU_GETTEXT' stderr : diff --git a/t/gettext-config-rpath.sh b/t/gettext-config-rpath.sh index 3953a0c3df83..522b42fce967 100644 --- a/t/gettext-config-rpath.sh +++ b/t/gettext-config-rpath.sh @@ -20,14 +20,14 @@ required='gettext' . test-init.sh cat >> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) # config.rpath is required by versions >= 0.14.3. AM_GNU_GETTEXT_VERSION([0.14.3]) AC_OUTPUT END -echo 'SUBDIRS = po intl' >Makefile.am -mkdir po intl +echo 'SUBDIRS = po' >Makefile.am +mkdir po # If aclocal fails here, it may be that gettext is too old to provide # AM_GNU_GETTEXT_VERSION. Similarly, autopoint will fail if it's diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh index e352e679079e..c91f005a1e3b 100644 --- a/t/gettext-macros.sh +++ b/t/gettext-macros.sh @@ -48,7 +48,7 @@ cat > configure.ac <> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) AC_OUTPUT END diff --git a/t/subdir-cond-gettext.sh b/t/subdir-cond-gettext.sh index 023eff134885..a203c025d308 100644 --- a/t/subdir-cond-gettext.sh +++ b/t/subdir-cond-gettext.sh @@ -20,18 +20,18 @@ required=gettext . test-init.sh cat >> configure.ac << 'END' -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) AM_CONDITIONAL([MAUDE], [true]) ALL_LINGUAS= AC_SUBST([ALL_LINGUAS]) END -mkdir po intl +mkdir po : >config.rpath cat > Makefile.am << 'END' if MAUDE -SUBDIRS = po intl +SUBDIRS = po else SUBDIRS = endif -- 2.39.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 18:52:43 2023 Received: (at 60772) by debbugs.gnu.org; 13 Jan 2023 23:52:43 +0000 Received: from localhost ([127.0.0.1]:52755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGTql-0000Z8-Il for submit@debbugs.gnu.org; Fri, 13 Jan 2023 18:52:43 -0500 Received: from freefriends.org ([96.88.95.60]:41986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGTqk-0000Z0-Jw for 60772@debbugs.gnu.org; Fri, 13 Jan 2023 18:52:42 -0500 X-Envelope-From: karl@freefriends.org Received: from freefriends.org (freefriends.org [96.88.95.60]) by freefriends.org (8.14.7/8.14.7) with ESMTP id 30DNqeQh022820 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Jan 2023 16:52:41 -0700 Received: (from apache@localhost) by freefriends.org (8.14.7/8.14.7/Submit) id 30DNqesZ022818; Fri, 13 Jan 2023 16:52:40 -0700 Date: Fri, 13 Jan 2023 16:52:40 -0700 Message-Id: <202301132352.30DNqesZ022818@freefriends.org> From: Karl Berry To: vapier@gentoo.org Subject: Re: [bug#60772] [PATCH] tests: rework gettext to only check 'external' behavior In-Reply-To: <20230113052052.19271-1-vapier@gentoo.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60772 Cc: 60772@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Subject: [bug#60772] [PATCH] tests: rework gettext to only check 'external' behavior Good catch, thanks. Please commit. +# po/ is required. intl/ should not be used. Perhaps add the bit of information from your mail to help future sleuths: "... not be used, since non-external use of gettext was deprecated in 2010 (gettext 0.18) and made fatal in 0.20 (2019)." Thanks, Karl From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 14 00:44:01 2023 Received: (at 60772) by debbugs.gnu.org; 14 Jan 2023 05:44:01 +0000 Received: from localhost ([127.0.0.1]:53016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGZKj-0002hD-5o for submit@debbugs.gnu.org; Sat, 14 Jan 2023 00:44:01 -0500 Received: from woodpecker.gentoo.org ([140.211.166.183]:43958 helo=smtp.gentoo.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGZKh-0002gj-7i for 60772@debbugs.gnu.org; Sat, 14 Jan 2023 00:44:00 -0500 Received: by smtp.gentoo.org (Postfix, from userid 559) id D4A2A340E33; Sat, 14 Jan 2023 05:43:52 +0000 (UTC) Date: Sat, 14 Jan 2023 00:43:50 -0500 From: Mike Frysinger To: Karl Berry Subject: Re: [bug#60772] [PATCH] tests: rework gettext to only check 'external' behavior Message-ID: References: <20230113052052.19271-1-vapier@gentoo.org> <202301132352.30DNqesZ022818@freefriends.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="kTwX0fBbVgzOgPvT" Content-Disposition: inline In-Reply-To: <202301132352.30DNqesZ022818@freefriends.org> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60772 Cc: 60772@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --kTwX0fBbVgzOgPvT Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 13 Jan 2023 16:52, Karl Berry wrote: > Subject: [bug#60772] [PATCH] tests: rework gettext to only check 'ext= ernal' > behavior >=20 > Good catch, thanks. Please commit. >=20 > +# po/ is required. intl/ should not be used. >=20 > Perhaps add the bit of information from your mail to help future > sleuths: >=20 > "... not be used, since non-external use of gettext was deprecated in > 2010 (gettext 0.18) and made fatal in 0.20 (2019)." will do, and have done -mike --kTwX0fBbVgzOgPvT Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEuQK1JxMl+JKsJRrUQWM7n+g39YEFAmPCQRYACgkQQWM7n+g3 9YHKgxAAlFKX/L9bKAFjSaWGSw+82KFqYkBqKQ/l4+YDc9fctNVTVqZ+zlXue/Pk lxB0uEGJnVXbXS+0+uCK88InHu8HokoIF4uZdGFdpyeqvcXRhHj6lTs6SCWuWRcb YBaggk77DQOpc/i/2i7WFe0RJBE7Ot+nB6KwEvt2Uc/MqaSL5cDc8ndRRtSKQDyZ T5uxNG0jB+FdILteJBnkWah6zthBSr4dfRQJaTASj1zkjwh7OLcla1A+K7XGfTOn QP5lq16MWz0LJHgY0vY/v+UEWIQ950Xb3sSl+jzXrVA9QtrmlvYL7BsfrWxlQZE0 mi+L5+82sQhWa4UqJeeOs0FrCJhvGp2hjhozfKH2m5ZirlnU6JzfVSL9IO25LHN5 sErfSg9xlznP7rLCs6b7m3CKY5OfSgIeUJgyjwpix8UNKuHjat9laJ1MTVWKwdwH TgWVGR+FdCStLTEUiSvnWfVPpN8UijlCQuUA+RQMhOryrzApOe/quDlZXCDhwhg5 vgQOs6bWi4QiN7kMJmtdc9cOYzwzcEEhp/kbMuxRMuy+gpTtLt7ylU5+J62WnKb6 Iyz5JBU65ZYlCbV8FOWyx9GB41ZpgZZuFe1dkQHO8FAFTuCxUzzBJ21S4lApRppI IcdnPaPFBP0zR0C0ZEpa5kIlAQ5MmFbqiTPuCtg0bEP5fuJXEW4= =IbHB -----END PGP SIGNATURE----- --kTwX0fBbVgzOgPvT-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 14 00:44:41 2023 Received: (at control) by debbugs.gnu.org; 14 Jan 2023 05:44:41 +0000 Received: from localhost ([127.0.0.1]:53019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGZLN-0002ia-HH for submit@debbugs.gnu.org; Sat, 14 Jan 2023 00:44:41 -0500 Received: from woodpecker.gentoo.org ([140.211.166.183]:44066 helo=smtp.gentoo.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGZLM-0002iM-4m for control@debbugs.gnu.org; Sat, 14 Jan 2023 00:44:40 -0500 Received: by smtp.gentoo.org (Postfix, from userid 559) id 8BD2C340E33; Sat, 14 Jan 2023 05:44:34 +0000 (UTC) From: Mike Frysinger To: control@debbugs.gnu.org Subject: Control message User-Agent: GNU debbugs/0 Message-Id: <20230114054434.8BD2C340E33@smtp.gentoo.org> Date: Sat, 14 Jan 2023 05:44:34 +0000 (UTC) X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 60772 thankyou From unknown Sun Jun 22 00:09:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 11 Feb 2023 12:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator