From patchwork Wed Oct 23 22:36:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DJ Delorie X-Patchwork-Id: 35270 Received: (qmail 6477 invoked by alias); 23 Oct 2019 22:36:41 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 6469 invoked by uid 89); 23 Oct 2019 22:36:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=locales, destdir, as-is, installation X-HELO: us-smtp-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571870198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KSp7VlSEI6yUrPGKWk1hwX27v6L3nd+JUT3rs7uMV0=; b=IiZI7dzUpjt7zk83ysftxjIn6/qCBBN6JvhpuSx2Gzbdgm2B/+i6/2fsDo4XeiDSKMQDrQ 4G7PzO8FkKrkSkUBvMbqEAUAm7o4qYMfVd3R4weUu37wqkuPuNqWvEDNfLc0EsKz56E2Hr E5rAb2Xn/PjYUFaFBUHKbk9lJ6RqZnw= Date: Wed, 23 Oct 2019 18:36:34 -0400 Message-Id: From: DJ Delorie To: libc-alpha@sourceware.org Subject: [patch v1] Install charmaps uncompressed in testroot X-Mimecast-Spam-Score: 0 From e3027d399f52f1a8bb74ef2fa3c360b396539342 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 23 Oct 2019 17:52:26 -0400 Subject: 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. diff --git a/Makefile b/Makefile index 0711b9725d..586437911a 100644 --- a/Makefile +++ b/Makefile @@ -580,8 +580,10 @@ ifeq ($(run-built-tests),yes) $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ done endif + rm -f $(symbolic_link_list) $(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..6c73e26df2 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -167,9 +167,15 @@ endif endif # Files to install. +ifeq ($(INSTALL_UNCOMPRESSED),yes) +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 +289,20 @@ endif include ../Rules +ifeq ($(INSTALL_UNCOMPRESSED),yes) +# Install the charmap files as-is. +$(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)