From patchwork Thu Dec 14 21:46:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 24950 Received: (qmail 11020 invoked by alias); 14 Dec 2017 21:47:04 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 11002 invoked by uid 89); 14 Dec 2017 21:47:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=lc_messages, LC_MESSAGES X-HELO: relay1.mentorg.com Date: Thu, 14 Dec 2017 21:46:55 +0000 From: Joseph Myers To: Florian Weimer CC: Subject: Re: Do not build .mo files in source directory (bug 14121) In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) On Thu, 14 Dec 2017, Florian Weimer wrote: > On 12/14/2017 07:13 PM, Joseph Myers wrote: > > 2017-12-14 Joseph Myers > > > > [BZ #14121] > > * po/Makefile (%.mo): Change to $(objpfx)%.mo. Use > > $(make-target-directory). > > ($(mo-installed)): Use $(objpfx)%.mo. > > I think the realclean and linguas.mo targets should be changed for > consistency. I've sent a patch that removes the linguas.mo rule. Relative to that, here is an updated version of the patch to stop building the files in the source directory, which also removes the realclean rule (replacing it with entries in the "generated" variable). Do not build .mo files in source directory (bug 14121). Building and installing glibc leaves .mo files (compiled message translations) behind in the source directory. Building those files in the source directory may once have made sense, if they were included in release tarballs; now that release tarballs are just the output of "git archive", building any non-checked-in files in the source directory does not make sense. This patch changes these files to be built in the build directory instead. The realclean rule is changed to simply adding the .mo files to the "generated" variable, since once the files are in the build directory it make no sense to exclude them from normal cleanup rules. This is necessary but not sufficient to avoid build-many-glibcs.py needing to copy the glibc source directory. Its list of files to touch on checkout to avoid subsequent regeneration (configure, preconfigure, *-kw.h) is incomplete (missing at least INSTALL, sysdeps/gnu/errlist.c, posix/testcases.h, posix/ptestcases.h, locale/C-translit.h, (only regenerated for Hurd builds) sysdeps/mach/hurd/bits/errno.h, (only regenerated for 32-bit SPARC builds) sysdeps/sparc/sparc32/{sdiv,udiv,rem,urem}.S) - the existing list may be sufficient to prevent regeneration that actually changes the file contents depending on the installed build tools, but not to ensure there is no regeneration at all - and there might well be other things writing into the source directory in the course of building and testing (so needing appropriate testing with read-only source directories with different timestamp orderings to find and eliminate all such cases). Tested for x86_64. 2017-12-14 Joseph Myers [BZ #14121] * po/Makefile (generated): Add $(ALL_LINGUAS:%=%.mo). (%.mo): Change to $(objpfx)%.mo. Use $(make-target-directory). ($(mo-installed)): Use $(objpfx)%.mo. (realclean): Remove rule. diff --git a/po/Makefile b/po/Makefile index 1fdce17..f811d33 100644 --- a/po/Makefile +++ b/po/Makefile @@ -44,6 +44,8 @@ mo-installed = $(inst_localedir)/%/LC_MESSAGES/$(domainname).mo # Files to install: a $(domainname).mo file for each language. install-others = $(LINGUAS:%=$(mo-installed)) +generated += $(ALL_LINGUAS:%=%.mo) + include ../Rules @@ -80,14 +82,12 @@ libc.pot.files: FORCE # Compile the binary message object files from the portable object source # files of translations for each language. -%.mo: %.po +$(objpfx)%.mo: %.po + $(make-target-directory) $(MSGFMT) -o $@ $< # Install the message object files as libc.po in the language directory. -$(mo-installed): %.mo $(+force); $(do-install) || exit 0 - -realclean: - rm -f $(ALL_LINGUAS:=.mo) +$(mo-installed): $(objpfx)%.mo $(+force); $(do-install) || exit 0 # Update translations from the translation project. TRANSLATIONS_URL = https://translationproject.org/latest/libc