From a0c8fa4159e95be94474dd18b21e6c5fc35362ae Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sun, 14 Feb 2010 22:04:50 +0000
Subject: [PATCH] Don't rely on tar supporting -z; trac #3841

---
 libffi/ghc.mk   |    2 +-
 mk/config.mk.in |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 1216a32..17a86ee 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -113,7 +113,7 @@ endif
 ifneq "$(BINDIST)" "YES"
 $(libffi_STAMP_CONFIGURE):
 	"$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build
-	cd libffi && $(TAR) -zxf ../ghc-tarballs/libffi/libffi*.tar.gz
+	cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP) -d | { cd libffi && $(TAR) -xf - ; }
 	mv libffi/libffi-* libffi/build
 	chmod +x libffi/ln
 	cd libffi/build && "$(PATCH)" -p1 < ../libffi.dllize-3.0.8.patch
diff --git a/mk/config.mk.in b/mk/config.mk.in
index ea3c1ff..1c59048 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -652,6 +652,8 @@ SIZE			= size
 STRIP			= strip
 PATCH			= @PatchCmd@
 TAR			= @TarCmd@
+BZIP2                   = bzip2
+GZIP                    = gzip
 ZIP			= zip
 
 HSCOLOUR = @HSCOLOUR@
-- 
1.7.10.4