summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2019-10-23 17:52:26 -0400
committerDJ Delorie <dj@redhat.com>2019-10-24 17:01:04 -0400
commit97476447edff96e526daa1a22d6ed3665181ff93 (patch)
tree886fb38e9d6bc0602d92fc6979914a7b821a4fd3 /Makefile
parent4052fa22f69c0964bb42c0f13daa791617253de5 (diff)
downloadglibc-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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 8 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))