diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-12-15 14:27:20 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-12-15 14:27:20 +0000 |
| commit | f2da2fd81f1d3f43678de9cf39b12692c6fa449b (patch) | |
| tree | 7489aa9141a88b12a080266763878aaa7369388a | |
| parent | 0c4fe28d7aaca041292d2db0a1a9ed4b64a7ddce (diff) | |
| download | glibc-f2da2fd81f1d3f43678de9cf39b12692c6fa449b.tar.gz glibc-f2da2fd81f1d3f43678de9cf39b12692c6fa449b.tar.xz glibc-f2da2fd81f1d3f43678de9cf39b12692c6fa449b.zip | |
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.
[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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | po/Makefile | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 83c4d07948..35c258cc1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2017-12-15 Joseph Myers <joseph@codesourcery.com> + [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. + * po/Makefile (linguas): Remove rule and dependencies. (linguas.mo): Likewise. (.PHONY): Do not depend on linguas and linguas.mo. diff --git a/po/Makefile b/po/Makefile index 1fdce17fa9..f811d33c52 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 |