GZIP changes were applied upstream.

This commit is contained in:
Aleksej Saushev 2011-01-08 12:53:57 +00:00 committed by Thomas Klausner
parent 8484a225c3
commit aafa813b73
3 changed files with 4 additions and 47 deletions

View file

@ -1,8 +1,7 @@
$NetBSD: distinfo,v 1.14 2010/10/19 12:26:27 makoto Exp $
$NetBSD: distinfo,v 1.15 2011/01/08 12:53:57 asau Exp $
SHA1 (llvm-2.6.tar.gz) = 547471147cbf6d3e49539e01196ffada2c79c250
RMD160 (llvm-2.6.tar.gz) = 24d58cb052ab5879aae59eaf4885ec41186ee22a
Size (llvm-2.6.tar.gz) = 7790380 bytes
SHA1 (patch-ac) = 706057dfbfaf86ae04e2642364de586e4b9476f8
SHA1 (patch-ad) = f0fd2e9902c1db6b5ed97bd87aeac73cc3ae3dfc
SHA1 (patch-ae) = b1c05fb7d9c701e0a110f8687d98f577929145ae
SHA1 (patch-ad) = 17cccba99328411cd76749bdb9bf541db5ad1f6b

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ad,v 1.3 2010/04/03 18:05:14 asau Exp $
$NetBSD: patch-ad,v 1.4 2011/01/08 12:53:57 asau Exp $
Don't use GZIP variable, it is used by gzip itself.
Adjust to our hierarchy rules.
--- Makefile.config.in.orig 2010-04-01 06:23:56.000000000 +0400
+++ Makefile.config.in 2010-04-01 06:31:38.000000000 +0400
@ -18,12 +18,3 @@ Don't use GZIP variable, it is used by gzip itself.
# Determine if we're on a unix type operating system
LLVM_ON_UNIX:=@LLVM_ON_UNIX@
@@ -159,7 +159,7 @@
DOT := @DOT@
DOXYGEN := @DOXYGEN@
GROFF := @GROFF@
-GZIP := @GZIP@
+GZIPBIN := @GZIP@
OCAMLC := @OCAMLC@
OCAMLOPT := @OCAMLOPT@
OCAMLDEP := @OCAMLDEP@

View file

@ -1,33 +0,0 @@
$NetBSD: patch-ae,v 1.2 2009/12/15 08:00:21 thomasklausner Exp $
Don't use GZIP variable, it is used by gzip itself.
--- docs/Makefile.orig 2009-12-15 00:10:07.000000000 +0000
+++ docs/Makefile
@@ -59,7 +59,7 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/html.tar
$(Verb) cd $(PROJ_SRC_DIR) && \
$(TAR) cf $(PROJ_OBJ_DIR)/html.tar *.html
- $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/html.tar
+ $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/html.tar
install-doxygen: doxygen
$(Echo) Installing doxygen documentation
@@ -82,7 +82,7 @@ $(PROJ_OBJ_DIR)/doxygen.tar.gz: $(DOXYFI
$(Echo) Packaging doxygen documentation
$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/doxygen.tar
$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/doxygen.tar doxygen
- $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/doxygen.tar
+ $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/doxygen.tar
$(Verb) $(CP) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_OBJ_DIR)/doxygen/html/
userloc: $(LLVM_SRC_ROOT)/docs/userloc.html
@@ -104,7 +104,7 @@ ocamldoc: regen-ocamldoc
$(Echo) Packaging ocamldoc documentation
$(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar*
$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc
- $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/ocamldoc.tar
+ $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar
$(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/
regen-ocamldoc: