[commit: ghc] ghc-8.0: validate: Use gz compression during bindist check (526df12)
git at git.haskell.org
git at git.haskell.org
Mon Jan 18 12:24:31 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/526df12607544c47dead378a9f5baec8dc3ab7fa/ghc
>---------------------------------------------------------------
commit 526df12607544c47dead378a9f5baec8dc3ab7fa
Author: Ben Gamari <bgamari.foss at gmail.com>
Date: Mon Jan 18 00:16:35 2016 +0100
validate: Use gz compression during bindist check
Test Plan: validate, check that gz is used
Reviewers: hvr, austin, thomie
Reviewed By: thomie
Differential Revision: https://phabricator.haskell.org/D1788
GHC Trac Issues: #11434
(cherry picked from commit 2fd407cd28ea1c8fccb7a93d411d1cee690fa959)
>---------------------------------------------------------------
526df12607544c47dead378a9f5baec8dc3ab7fa
mk/config.mk.in | 2 +-
validate | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5d13f0c..7e4b327 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -776,7 +776,7 @@ GZIP_CMD = gzip
XZ_CMD = xz -9e
# xz is default compression
-TAR_COMP = xz
+TAR_COMP ?= xz
# select compression command and .tar extension based on TAR_COMP value
ifeq "$(TAR_COMP)" "bzip2"
diff --git a/validate b/validate
index 3b21002..dadd556 100755
--- a/validate
+++ b/validate
@@ -47,6 +47,10 @@ hpc=NO
speed=NORMAL
use_dph=0
be_quiet=0
+# Validate uses gzip compression for the binary distribution to avoid the rather
+# heavy cost of xz, which is the typical default. The options are defined in
+# mk/config.mk.in
+tar_comp=gzip
while [ $# -gt 0 ]
do
@@ -211,8 +215,8 @@ check_packages post-build
if [ $speed != "FAST" ]; then
- $make binary-dist-prep
- $make test_bindist TEST_PREP=YES
+ $make binary-dist-prep TAR_COMP=$tar_comp
+ $make test_bindist TEST_PREP=YES TAR_COMP=$tar_comp
#
# Install the xhtml package into the bindist.
More information about the ghc-commits
mailing list