[Pkg-haskell-commits] darcs: ghc: Refresh ./patches/system-libffi

[Joachim Breitner]

Sat Jul 30 14:23:42 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh ./patches/system-libffi
  Ignore-this: 7a6021f72eb7783cec3acbba0e2d1de4

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

Sat Jul 30 14:23:42 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh ./patches/system-libffi
  Ignore-this: 7a6021f72eb7783cec3acbba0e2d1de4
diff -rN -u old-ghc//patches/system-libffi new-ghc//patches/system-libffi
--- old-ghc//patches/system-libffi	2012-02-03 16:38:05.630253041 +0000
+++ new-ghc//patches/system-libffi	2012-02-03 16:38:08.183250385 +0000
@@ -1,10 +1,10 @@
-Index: ghc-7.0.3/rts/ghc.mk
+Index: ghc-7.2.0.20110728/rts/ghc.mk
 ===================================================================
---- ghc-7.0.3.orig/rts/ghc.mk	2011-04-09 17:12:53.000000000 +0530
-+++ ghc-7.0.3/rts/ghc.mk	2011-04-09 17:12:55.000000000 +0530
-@@ -457,15 +457,13 @@
+--- ghc-7.2.0.20110728.orig/rts/ghc.mk	2011-07-28 19:12:04.000000000 +0200
++++ ghc-7.2.0.20110728/rts/ghc.mk	2011-07-30 16:22:27.000000000 +0200
+@@ -455,15 +455,13 @@
  
- $(eval $(call build-dependencies,rts,dist,1))
+ $(eval $(call dependencies,rts,dist,1))
  
 -$(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H)
 -
@@ -22,10 +22,10 @@
  
  # -----------------------------------------------------------------------------
  # compile dtrace probes if dtrace is supported
-Index: ghc-7.0.3/rts/package.conf.in
+Index: ghc-7.2.0.20110728/rts/package.conf.in
 ===================================================================
---- ghc-7.0.3.orig/rts/package.conf.in	2011-04-09 17:12:53.000000000 +0530
-+++ ghc-7.0.3/rts/package.conf.in	2011-04-09 17:12:55.000000000 +0530
+--- ghc-7.2.0.20110728.orig/rts/package.conf.in	2011-07-28 19:12:04.000000000 +0200
++++ ghc-7.2.0.20110728/rts/package.conf.in	2011-07-30 16:22:27.000000000 +0200
 @@ -24,8 +24,9 @@
  hs-libraries:   "HSrts"
  
@@ -45,11 +45,11 @@
  hugs-options:
  cc-options:
  
-Index: ghc-7.0.3/ghc.mk
+Index: ghc-7.2.0.20110728/ghc.mk
 ===================================================================
---- ghc-7.0.3.orig/ghc.mk	2011-04-09 17:12:53.000000000 +0530
-+++ ghc-7.0.3/ghc.mk	2011-04-09 17:12:55.000000000 +0530
-@@ -439,7 +439,6 @@
+--- ghc-7.2.0.20110728.orig/ghc.mk	2011-07-28 19:12:04.000000000 +0200
++++ ghc-7.2.0.20110728/ghc.mk	2011-07-30 16:22:59.000000000 +0200
+@@ -449,7 +449,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,9 +57,9 @@
  endif
  
  # --------------------------------
-@@ -454,11 +453,6 @@
+@@ -467,11 +466,6 @@
  endif
- BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB))
+ BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB))
  
 -OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
 -ifeq "$(BuildSharedLibs)" "YES"
@@ -69,7 +69,7 @@
  # ----------------------------------------
  # Special magic for the ghc-prim package
  
-@@ -583,7 +577,6 @@
+@@ -560,7 +554,6 @@
     driver/ghci \
     driver/ghc \
     driver/haddock \
@@ -77,7 +77,7 @@
     includes \
     rts
  
-@@ -941,11 +934,10 @@
+@@ -865,11 +858,10 @@
  
  # Now we can do the installation
  install_packages: install_libexecs
@@ -90,16 +90,16 @@
  	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
  	$(foreach p, $(INSTALLED_PKG_DIRS),                           \
  	    $(call make-command,                                      \
-@@ -1027,7 +1019,7 @@
+@@ -957,7 +949,7 @@
  unix-binary-dist-prep:
  	"$(RM)" $(RM_OPTS_REC) bindistprep/
  	"$(MKDIRHIER)" $(BIN_DIST_PREP_DIR)
--	set -e; for i in packages LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
-+	set -e; for i in packages LICENSE compiler ghc rts libraries utils docs includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
+-	set -e; for i in packages LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh settings.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
++	set -e; for i in packages LICENSE compiler ghc rts libraries utils docs includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh settings.in ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
  	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)
-@@ -1106,7 +1098,7 @@
+@@ -1042,7 +1034,7 @@
  #
  # Files to include in source distributions
  #