qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
DJ Delorie 2019-10-23 17:52:26 -04:00
parent 4052fa22f6
commit 97476447ed
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -580,8 +580,15 @@ ifeq ($(run-built-tests),yes)
$(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\
done done
endif 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 \ $(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 touch $(objpfx)testroot.pristine/install.stamp
tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special)) tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))

18
localedata/Makefile
View File

@ -167,9 +167,17 @@ endif
endif endif
# Files to install. # 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)/, \ install-others := $(addprefix $(inst_i18ndir)/, \
$(addsuffix .gz, $(charmaps)) \ $(addsuffix .gz, $(charmaps)) \
$(locales)) $(locales))
endif
tests: $(objdir)/iconvdata/gconv-modules tests: $(objdir)/iconvdata/gconv-modules
@ -283,12 +291,22 @@ endif
include ../Rules 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. # Install the charmap files in gzipped format.
$(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force) $(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force)
$(make-target-directory) $(make-target-directory)
rm -f $(@:.gz=) $@ rm -f $(@:.gz=) $@
$(INSTALL_DATA) $< $(@:.gz=) $(INSTALL_DATA) $< $(@:.gz=)
gzip -9n $(@:.gz=) gzip -9n $(@:.gz=)
endif
# Install the locale source files in the appropriate directory. # Install the locale source files in the appropriate directory.
$(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install) $(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install)