projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ca10c79
)
Don't rely on tar supporting -z; trac #3841
author
Ian Lynagh
<igloo@earth.li>
Sun, 14 Feb 2010 22:04:50 +0000
(22:04 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 14 Feb 2010 22:04:50 +0000
(22:04 +0000)
libffi/ghc.mk
patch
|
blob
|
history
mk/config.mk.in
patch
|
blob
|
history
diff --git
a/libffi/ghc.mk
b/libffi/ghc.mk
index
1216a32
..
17a86ee
100644
(file)
--- 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
(file)
--- 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@