[Pkg-haskell-commits] darcs: ghc: Refresh patch system-libffi

[Joachim Breitner]

Sat Mar  5 13:30:57 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patch system-libffi
  Ignore-this: bf5f5bddc35dc923e048ea5177defcd0

    M ./patches/system-libffi -18 +18

Sat Mar  5 13:30:57 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patch system-libffi
  Ignore-this: bf5f5bddc35dc923e048ea5177defcd0
diff -rN -u old-ghc/patches/system-libffi new-ghc/patches/system-libffi
--- old-ghc/patches/system-libffi	2011-03-05 13:39:55.839131379 +0000
+++ new-ghc/patches/system-libffi	2011-03-05 13:39:55.855132222 +0000
@@ -1,8 +1,8 @@
-Index: ghc-7.0.1/rts/ghc.mk
+Index: ghc-7.0.2/rts/ghc.mk
 ===================================================================
---- ghc-7.0.1.orig/rts/ghc.mk	2011-01-15 12:29:51.000000000 +0530
-+++ ghc-7.0.1/rts/ghc.mk	2011-01-15 12:29:53.000000000 +0530
-@@ -430,15 +430,13 @@
+--- ghc-7.0.2.orig/rts/ghc.mk	2011-02-28 23:40:09.000000000 +0530
++++ ghc-7.0.2/rts/ghc.mk	2011-03-05 18:59:35.000000000 +0530
+@@ -457,15 +457,13 @@
  
  $(eval $(call build-dependencies,rts,dist,1))
  
@@ -22,10 +22,10 @@
  
  # -----------------------------------------------------------------------------
  # compile dtrace probes if dtrace is supported
-Index: ghc-7.0.1/rts/package.conf.in
+Index: ghc-7.0.2/rts/package.conf.in
 ===================================================================
---- ghc-7.0.1.orig/rts/package.conf.in	2011-01-15 12:29:51.000000000 +0530
-+++ ghc-7.0.1/rts/package.conf.in	2011-01-15 12:29:53.000000000 +0530
+--- ghc-7.0.2.orig/rts/package.conf.in	2011-02-28 23:40:09.000000000 +0530
++++ ghc-7.0.2/rts/package.conf.in	2011-03-05 18:59:35.000000000 +0530
 @@ -24,8 +24,9 @@
  hs-libraries:   "HSrts"
  
@@ -45,11 +45,11 @@
  hugs-options:
  cc-options:
  
-Index: ghc-7.0.1/ghc.mk
+Index: ghc-7.0.2/ghc.mk
 ===================================================================
---- ghc-7.0.1.orig/ghc.mk	2011-01-15 12:29:56.000000000 +0530
-+++ ghc-7.0.1/ghc.mk	2011-01-15 12:30:20.000000000 +0530
-@@ -437,7 +437,6 @@
+--- ghc-7.0.2.orig/ghc.mk	2011-02-28 23:40:08.000000000 +0530
++++ ghc-7.0.2/ghc.mk	2011-03-05 19:00:15.000000000 +0530
+@@ -439,7 +439,6 @@
  # add the final two package.conf dependencies: ghc-prim depends on RTS,
  # and RTS depends on libffi.
  libraries/ghc-prim/dist-install/package-data.mk : rts/package.conf.inplace
@@ -57,7 +57,7 @@
  endif
  
  # --------------------------------
-@@ -452,11 +451,6 @@
+@@ -454,11 +453,6 @@
  endif
  BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB))
  
@@ -69,7 +69,7 @@
  # ----------------------------------------
  # Special magic for the ghc-prim package
  
-@@ -581,7 +575,6 @@
+@@ -583,7 +577,6 @@
     driver/ghci \
     driver/ghc \
     driver/haddock \
@@ -77,20 +77,20 @@
     includes \
     rts
  
-@@ -937,11 +930,10 @@
+@@ -941,11 +934,10 @@
  
  # Now we can do the installation
  install_packages: install_libexecs
 -install_packages: libffi/package.conf.install rts/package.conf.install
 +install_packages: rts/package.conf.install
- 	$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
+ 	$(call INSTALL_DIR,"$(DESTDIR)$(topdir)")
  	"$(RM)" $(RM_OPTS_REC) "$(INSTALLED_PACKAGE_CONF)"
- 	$(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)"
+ 	$(call INSTALL_DIR,"$(INSTALLED_PACKAGE_CONF)")
 -	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update libffi/package.conf.install
  	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
  	$(foreach p, $(INSTALLED_PKG_DIRS),                           \
  	    $(call make-command,                                      \
-@@ -1024,7 +1016,7 @@
+@@ -1028,7 +1020,7 @@
  unix-binary-dist-prep:
  	"$(RM)" $(RM_OPTS_REC) bindistprep/
  	"$(MKDIRHIER)" $(BIN_DIST_PREP_DIR)
@@ -99,7 +99,7 @@
  	echo "HADDOCK_DOCS       = $(HADDOCK_DOCS)"       >> $(BIN_DIST_MK)
  	echo "LATEX_DOCS         = $(LATEX_DOCS)"         >> $(BIN_DIST_MK)
  	echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
-@@ -1102,7 +1094,7 @@
+@@ -1107,7 +1099,7 @@
  #
  # Files to include in source distributions
  #