diff options
| author | DJ Delorie <dj@redhat.com> | 2019-10-23 17:52:26 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2019-10-24 17:01:04 -0400 |
| commit | 97476447edff96e526daa1a22d6ed3665181ff93 (patch) | |
| tree | 886fb38e9d6bc0602d92fc6979914a7b821a4fd3 | |
| parent | 4052fa22f69c0964bb42c0f13daa791617253de5 (diff) | |
| download | glibc-97476447edff96e526daa1a22d6ed3665181ff93.tar.gz glibc-97476447edff96e526daa1a22d6ed3665181ff93.tar.xz glibc-97476447edff96e526daa1a22d6ed3665181ff93.zip | |
Install charmaps uncompressed in testroot
The testroot does not have a gunzip command, so the charmap files should not be installed gzipped else they cannot be used (and thus tested). With this patch, installing with INSTALL_UNCOMPRESSED=yes installs uncompressed charmaps instead. Note that we must purge the $(symbolic_link_list) as it contains references to $(DESTDIR), which we change during the testroot installation. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | localedata/Makefile | 18 |
2 files changed, 26 insertions, 1 deletions
diff --git a/Makefile b/Makefile index 0711b9725d..335155ce3c 100644 --- a/Makefile +++ b/Makefile @@ -580,8 +580,15 @@ ifeq ($(run-built-tests),yes) $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ done endif + # $(symbolic-link-list) is a file that encodes $(DESTDIR) so we + # have to purge it + rm -f $(symbolic-link-list) + # Setting INSTALL_UNCOMPRESSED causes localedata/Makefile to + # install the charmaps uncompressed, as the testroot does not + # provide a gunzip program. $(MAKE) install DESTDIR=$(objpfx)testroot.pristine \ - subdirs='$(sorted-subdirs)' + INSTALL_UNCOMPRESSED=yes subdirs='$(sorted-subdirs)' + rm -f $(symbolic-link-list) touch $(objpfx)testroot.pristine/install.stamp tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special)) diff --git a/localedata/Makefile b/localedata/Makefile index 33e473a883..ce6a750144 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -167,9 +167,17 @@ endif endif # Files to install. +ifeq ($(INSTALL_UNCOMPRESSED),yes) +# This option is for testing inside the testroot container, as the +# container does not include a working gunzip program. +install-others := $(addprefix $(inst_i18ndir)/, \ + $(charmaps) \ + $(locales)) +else install-others := $(addprefix $(inst_i18ndir)/, \ $(addsuffix .gz, $(charmaps)) \ $(locales)) +endif tests: $(objdir)/iconvdata/gconv-modules @@ -283,12 +291,22 @@ endif include ../Rules +ifeq ($(INSTALL_UNCOMPRESSED),yes) +# Install the charmap files as-is. This option is for testing inside +# the testroot container, as the container does not include a working +# gunzip program. +$(inst_i18ndir)/charmaps/%: charmaps/% $(+force) + $(make-target-directory) + rm -f $@ + $(INSTALL_DATA) $< $@ +else # Install the charmap files in gzipped format. $(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force) $(make-target-directory) rm -f $(@:.gz=) $@ $(INSTALL_DATA) $< $(@:.gz=) gzip -9n $(@:.gz=) +endif # Install the locale source files in the appropriate directory. $(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install) |