From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.24]) by sourceware.org (Postfix) with ESMTPS id 16DDA386F41B for ; Tue, 21 Jun 2022 02:05:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 16DDA386F41B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=clisp.org Authentication-Results: sourceware.org; spf=none smtp.mailfrom=clisp.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1655777130; s=strato-dkim-0002; d=clisp.org; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=K2nhxMwA2QTvFBNm5GkCKjHzP7OwGE/K+IbY8H7dNHw=; b=jEtw4HQ8xfuY3fW1Mxt8DjKFbSIzlSmhA3mGSlvU4pSnN3MfiFQaqVrBJt/to8c4Jh rOwphqrtH3NYsNXd0jBZfzvrHkwDnCNzet3/RcLS7KE0VtEmMkDlNX8to4Ksq3R0bNzB NJH7k4UmLTNG4d8ELxbGq2+QPhi84gr+oUTjMOmX+R324XDOFQXfBauKaYvE9tQHgnpU iGkatP8dd+Pfbv960X+HJRsJnOw5kModWD0/eXsYqcou5NN0Z0mYfpISzx70GKEjd2OK z59ui/5rNBei9cGjGemyWPPMLVTGj4Q7d/1z1vbo6X584dL3FkEBig08f50W6/FD72w9 GN4A== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH0WWb0LN8XZoH94zm6Ln9gbQqBm1EN8RcqJPlmc0tjwl16lMu5mw==" X-RZG-CLASS-ID: mo00 Received: from omega.localnet by smtp.strato.de (RZmta 47.46.0 AUTH) with ESMTPSA id J5c42fy5L25UUcW (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 21 Jun 2022 04:05:30 +0200 (CEST) From: Bruno Haible To: Iain Sandoe Cc: GCC Development Subject: Re: remove intl/ directory? Date: Tue, 21 Jun 2022 04:05:29 +0200 Message-ID: <5937718.KnAXcdumGx@omega> In-Reply-To: <9181FC49-E1B7-402F-9B5C-6D7C81D62EC8@googlemail.com> References: <32334822.2dzg3u6YtW@omega> <61E1C7F4-3CC0-4346-BEE4-3FAC928C5181@googlemail.com> <9181FC49-E1B7-402F-9B5C-6D7C81D62EC8@googlemail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: gcc@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2022 02:05:35 -0000 Hi Iain, > So, indeed, part of this is quite straight forward - we can amend the Mak= efile.def > to specify that GCC should use gettext-runtime (it will be used if the di= rectory is > present, otherwise there will be no intl support). >=20 > The tricky part is that we need to use the runtime =E2=80=98uninstalled= =E2=80=99, and here is where > intl is helpful - it provides a =E2=80=98config.intl=E2=80=99 that can be= sourced via gettext-sister.m4 > to provide the neccessary configure input to directories that want to use= intl. >=20 > I have hacked a change to gettext-sister.m4 that fishes the same informat= ion out > of gettext-runtime/Makefile (as configured in $build) - obviously this is= going to be > fragile w.r.t different versions of gettext-runtime (so I am not suggesti= ng this is a > viable patch) - simply something to illustrate what needs to be figured o= ut. >=20 > So - the changes are in Makefile.def and config/gettext-sister.m4 (the pa= tch includes > the regenerated files for convenience of use). >=20 > I tried this with gettext-0.21 on macOS 10.15 and, AFAICT, it DTRT - but = needs work > to resolve the main point above. Excellent! Glad to see that you are going ahead so quickly. I have now added the necessary support for this "uninstalled" situation from the gettext side: https://git.savannah.gnu.org/gitweb/?p=3Dgettext.git;a=3Dcommitdiff;h=3D6f0= 48e30a88282ed6712ce8d6000302fd287daad This is in a form that is maintainable from gettext's side. I believe that with this, you can change these lines from gettext-sister.m4 BUILD_INCLUDED_LIBINTL=3D`grep BUILD_INCLUDED_LIBINTL ../gettext-runtime/= Makefile|sed s/BUILD_INCLUDED_LIBINTL\ =3D\ //` USE_NLS=3D`grep USE_NLS ../gettext-runtime/Makefile|sed s/USE_NLS\ =3D\ /= /` LIBICONV=3D`grep ^LIBICONV ../gettext-runtime/Makefile|sed s/LIBICONV\ = =3D\ //` INTL_MACOSX_LIBS=3D`grep ^INTL_MACOSX_LIBS ../gettext-runtime/Makefile|se= d s/INTL_MACOSX_LIBS\ =3D\ //` XGETTEXT=3D`grep XGETTEXT ../gettext-runtime/Makefile|sed s/XGETTEXT\ =3D= \ //` GMSGFMT=3D`grep GMSGFMT ../gettext-runtime/Makefile|sed s/GMSGFMT\ =3D\ /= /` POSUB=3D`grep POSUB ../gettext-runtime/Makefile|sed s/POSUB\ =3D\ //` LIBINTL=3D"\${top_builddir}/../gettext-runtime/intl/.libs/libintl.a $LIBI= CONV $INTL_MACOSX_LIBS" INCINTL=3D"-I\${top_builddir}/../gettext-runtime/intl" roughly to this: relative_builddir=3D'${top_builddir}/../gettext-runtime' . ${top_builddir}/../gettext-runtime/uninstalled-config.sh There is also a GCC specific quirk, that I upstreamed into GNU gettext: https://git.savannah.gnu.org/gitweb/?p=3Dgettext.git;a=3Dcommitdiff;h=3Dfdc= 2bd236a6a62b477c1fca4205df10b0e64266b > P.S. I am slighty surprised that configuring with =E2=80=94disable-java d= oes not appear to stop > the on-screen popup appearing that tells me I need to install Java to use= this =E2=80=A6 that > would be an irritation when using this on a headless box. Thanks for reporting this; it should be fixed now, through https://git.savannah.gnu.org/gitweb/?p=3Dgettext.git;a=3Dcommitdiff;h=3D971= dcbdbebb05d7ae8aa6399a0c79442fa996c5c You find a tarball from the current gettext git, that contains all these changes, in https://alpha.gnu.org/gnu/gettext/gettext-20220620.tar.gz . Obviously, the GCC documentation will have to say that all this works only with GNU gettext 0.22 or newer, i.e. after I make the next release. Bruno