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

[Joachim Breitner]

Mon Oct  8 11:09:29 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh system-libffi
  Ignore-this: 6cdeee570fc2b242b089b6b9459676be

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

Mon Oct  8 11:09:29 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh system-libffi
  Ignore-this: 6cdeee570fc2b242b089b6b9459676be
diff -rN -u old-ghc//patches/system-libffi new-ghc//patches/system-libffi
--- old-ghc//patches/system-libffi	2012-10-08 12:00:50.242225454 +0000
+++ new-ghc//patches/system-libffi	2012-10-08 12:00:50.282227546 +0000
@@ -1,10 +1,10 @@
 This patch could be replaced by a configure call if
 http://hackage.haskell.org/trac/ghc/ticket/5743 were fixed.
 
-Index: ghc-7.4.0.20111219/rts/package.conf.in
+Index: ghc-7.6.1/rts/package.conf.in
 ===================================================================
---- ghc-7.4.0.20111219.orig/rts/package.conf.in	2011-12-21 23:21:03.000000000 +0100
-+++ ghc-7.4.0.20111219/rts/package.conf.in	2011-12-21 23:21:04.000000000 +0100
+--- ghc-7.6.1.orig/rts/package.conf.in	2012-09-04 19:10:15.000000000 +0200
++++ ghc-7.6.1/rts/package.conf.in	2012-10-08 13:06:55.167887121 +0200
 @@ -24,8 +24,9 @@
  hs-libraries:   "HSrts"
  
@@ -16,48 +16,38 @@
  #endif
  #ifdef HAVE_LIBRT
  			      , "rt"
-Index: ghc-7.4.0.20111219/ghc.mk
+Index: ghc-7.6.1/ghc.mk
 ===================================================================
---- ghc-7.4.0.20111219.orig/ghc.mk	2011-12-21 23:21:03.000000000 +0100
-+++ ghc-7.4.0.20111219/ghc.mk	2011-12-21 23:21:04.000000000 +0100
-@@ -579,7 +579,6 @@
-    driver/ghci \
+--- ghc-7.6.1.orig/ghc.mk	2012-09-04 19:10:15.000000000 +0200
++++ ghc-7.6.1/ghc.mk	2012-10-08 13:06:55.171887120 +0200
+@@ -600,7 +600,6 @@
+    $(MAYBE_GHCI) \
     driver/ghc \
     driver/haddock \
 -   libffi \
     includes \
     rts
  
-Index: ghc-7.4.0.20111219/rts/ghc.mk
+Index: ghc-7.6.1/rts/ghc.mk
 ===================================================================
---- ghc-7.4.0.20111219.orig/rts/ghc.mk	2011-12-21 19:56:29.000000000 +0100
-+++ ghc-7.4.0.20111219/rts/ghc.mk	2011-12-21 23:23:52.000000000 +0100
-@@ -86,8 +86,7 @@
- ALL_RTS_DEF_LIBNAMES 	= base ghc-prim
- ALL_RTS_DEF_LIBS	= \
- 	rts/dist/build/win32/libHSbase.dll.a \
--	rts/dist/build/win32/libHSghc-prim.dll.a \
--	libffi/build/inst/lib/libffi.dll.a
-+	rts/dist/build/win32/libHSghc-prim.dll.a 
- 
- # -- import libs for the regular Haskell libraries
- define make-importlib-def # args $1 = lib name
-@@ -172,12 +171,12 @@
+--- ghc-7.6.1.orig/rts/ghc.mk	2012-09-04 19:10:15.000000000 +0200
++++ ghc-7.6.1/rts/ghc.mk	2012-10-08 13:08:52.019882891 +0200
+@@ -177,12 +177,12 @@
  # Making a shared library for the RTS.
  ifneq "$$(findstring dyn, $1)" ""
- ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
--$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/build/libffi-5.dll
+ ifeq "$$(HostOS_CPP)" "mingw32" 
+-$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/build/$$(LIBFFI_DLL)
 +$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend
  	"$$(RM)" $$(RM_OPTS) $$@
  	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
- 	  -no-auto-link-packages -Lrts/dist/build -lffi-5 `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
+ 	  -no-auto-link-packages -Lrts/dist/build -l$(LIBFFI_WINDOWS_LIB) `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
  else
 -$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext)
 +$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend
  	"$$(RM)" $$(RM_OPTS) $$@
  	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
  	  -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \
-@@ -188,9 +187,9 @@
+@@ -193,9 +193,9 @@
  endif
  endif
  else
@@ -69,12 +59,12 @@
  		$$(AR_OPTS_STAGE1) $$(EXTRA_AR_ARGS_STAGE1) $$@
  endif
  
-@@ -504,10 +503,8 @@
+@@ -509,10 +509,8 @@
  # installing
  
  INSTALL_LIBS += $(ALL_RTS_LIBS)
 -INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
--INSTALL_LIBS += $(wildcard rts/dist/build/libffi-5.dll)
+-INSTALL_LIBS += $(wildcard rts/dist/build/$(LIBFFI_DLL))
  
 -install: install_libffi_headers
 +install: