diff options
| author | Juro Bystricky <juro.bystricky@intel.com> | 2017-11-30 21:21:15 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-11-30 21:21:15 +0000 |
| commit | 1faaf7035cabda101e1d6653bff7a539f201db91 (patch) | |
| tree | 8563d28593f48f5ac5229db74c2e79db2fe917b2 /intl/Makefile | |
| parent | bd6ea9edd1708c7b0166af685a676b91e5b5950d (diff) | |
| download | glibc-1faaf7035cabda101e1d6653bff7a539f201db91.tar glibc-1faaf7035cabda101e1d6653bff7a539f201db91.tar.gz glibc-1faaf7035cabda101e1d6653bff7a539f201db91.tar.bz2 glibc-1faaf7035cabda101e1d6653bff7a539f201db91.zip | |
plural.c: improve reproducibility
There is a subtle non-determinism when building glibc.
This depends on whether the glibc is built using the distibuted
file intl/plural.c or built using the generated file intl/plural.c.
These two files (intl/plural.c generated vs. distributed) are slightly
different, hence we may end up with slightly different libraries.
Originally, having "bison" installed was optional. So if "bison" was
not present, we always built libraries with the distributed plural.c.
If bison was installed, we *** may have *** replaced the distributed
file plural.c with a new plural.c generated from plural.y. if the
timestamps triggered this rule:
plural.c plural.y
$(BISON) $(BISONFLAGS) $@ $^
Given that timestamps are not preserved in GIT repositories, the above
rule is not reliable without explicitly touching plural.c or plural.y.
In other words, the rule may or may not have fired.
In summary: there are two distinct sources of non-determinism:
1. Having "bison" installed or not
2. Having "bison" installed but timestamps poorly defined.
This patch fixes this by requiring "bison" being installed
and by always generating intl/plural.c from intl/plural.y.
(This is achieved by simply removing checked-in intl/plural.c)
[BZ #22432]
* configure.ac (BISON): Require to be present.
* configure: Regenerated.
* intl/Makefile (generated): Add plural.c.
[$(BISON) != no]: Make code unconditional.
(plural.c): Change rule to $(objpfx)plural.c.
($(objpfx)plural.o): Depend on $(objpfx)plural.c.
* intl/plural.c: Remove.
* manual/install.texi (Tools for Compilation): Document bison as
required.
* INSTALL: Regenerated.
Diffstat (limited to 'intl/Makefile')
| -rw-r--r-- | intl/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/intl/Makefile b/intl/Makefile index c8bec9b138..2deb6ef25e 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -38,14 +38,13 @@ before-compile += $(objpfx)msgs.h install-others = $(inst_localedir)/locale.alias -generated += msgs.h mtrace-tst-gettext.out tst-gettext.mtrace +generated += msgs.h mtrace-tst-gettext.out tst-gettext.mtrace plural.c generated-dirs += domaindir localedir -ifneq (no,$(BISON)) -plural.c: plural.y +$(objpfx)plural.c: plural.y $(BISON) $(BISONFLAGS) $@ $^ -endif -$(objpfx)plural.o: plural.c + +$(objpfx)plural.o: $(objpfx)plural.c ifeq ($(run-built-tests),yes) ifeq (yes,$(build-shared)) |